diff --git a/720p/Defaults.xml b/720p/Defaults.xml
index 2c067b51..0509866c 100644
--- a/720p/Defaults.xml
+++ b/720p/Defaults.xml
@@ -28,7 +28,7 @@
 		<disabledcolor>grey3</disabledcolor>
 		<textoffsetx>7</textoffsetx>
 		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 	<default type="togglebutton">
 		<left>140</left>
@@ -43,7 +43,7 @@
 		<label/>
 		<font>font13</font>
 		<disabledcolor>grey3</disabledcolor>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 	<default type="textbox">
 		<left>220</left>
@@ -82,7 +82,7 @@
 		<subtype>text</subtype>
 		<textoffsetx>-5</textoffsetx>
 		<textoffsety>0</textoffsety>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 	<default type="spincontrolex">
 		<left>530</left>
@@ -105,7 +105,7 @@
 		<textoffsetx>7</textoffsetx>
 		<aligny>center</aligny>
 		<reverse>yes</reverse>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 	<default type="radiobutton">
 		<left>300</left>
@@ -128,7 +128,7 @@
 		<disabledcolor>grey3</disabledcolor>
 		<textoffsetx>7</textoffsetx>
 		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 	<default type="colorbutton">
 		<posx>0</posx>
@@ -139,14 +139,14 @@
 		<colorheight>76</colorheight>
 		<texturecolormask>color-button-box.png</texturecolormask>
 		<texturecolordisabledmask colordiffuse="40FFFFFF">color-button-box.png</texturecolordisabledmask>
-		<texturefocus>list_focus.png</texturefocus>
+		<texturefocus></texturefocus>
 		<texturenofocus></texturenofocus>
-		<font>font20</font>
+		<font>font13</font>
 		<textcolor>white</textcolor>
 		<disabledcolor>grey2</disabledcolor>
 		<textoffsetx>7</textoffsetx>
 		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 	<default type="selectbutton">
 		<left>490</left>
@@ -213,6 +213,6 @@
 		<invalidcolor>invalid</invalidcolor>
 		<textoffsetx>7</textoffsetx>
 		<aligny>center</aligny>
-		<pulseonselect>no</pulseonselect>
+		<pulseonselect>false</pulseonselect>
 	</default>
 </includes>
diff --git a/720p/DialogAddonInfo.xml b/720p/DialogAddonInfo.xml
index 75d2bb4f..c46ac47f 100644
--- a/720p/DialogAddonInfo.xml
+++ b/720p/DialogAddonInfo.xml
@@ -28,7 +28,7 @@
 				<height>220</height>
 				<aspectratio>keep</aspectratio>
 				<texture>$INFO[ListItem.Icon]</texture>
-				<bordertexture border="8">ThumbShadow.png</bordertexture>
+				<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 				<bordersize>8</bordersize>
 			</control>
 			<control type="label">
diff --git a/720p/DialogButtonMenu.xml b/720p/DialogButtonMenu.xml
index b5282f79..7f87f73b 100644
--- a/720p/DialogButtonMenu.xml
+++ b/720p/DialogButtonMenu.xml
@@ -81,7 +81,7 @@
 				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>Quit()</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13012</label>
 				<visible>System.ShowExitButton</visible>
@@ -98,7 +98,7 @@
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>Powerdown()</onclick>
 				<visible>System.CanPowerDown</visible>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13016</label>
 			</control>
@@ -113,7 +113,7 @@
 				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>AlarmClock(shutdowntimer,Shutdown())</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>20150</label>
 				<visible>!System.HasAlarm(shutdowntimer)</visible>
@@ -130,7 +130,7 @@
 				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>CancelAlarm(shutdowntimer)</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>20151</label>
 				<visible>System.HasAlarm(shutdowntimer)</visible>
@@ -147,7 +147,7 @@
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>Suspend()</onclick>
 				<visible>System.CanSuspend</visible>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13011</label>
 			</control>
@@ -163,7 +163,7 @@
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>Hibernate()</onclick>
 				<visible>System.CanHibernate</visible>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13010</label>
 			</control>
@@ -179,7 +179,7 @@
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>Reset()</onclick>
 				<visible>System.CanReboot</visible>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13013</label>
 			</control>
@@ -195,7 +195,7 @@
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>dialog.close(all,true)</onclick>
 				<onclick>System.LogOff</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>$LOCALIZE[20126] $INFO[system.profilename]</label>
 				<visible>System.HasLoginScreen | Integer.IsGreater(System.ProfileCount,1)</visible>
@@ -218,7 +218,7 @@
 				<alttexturefocus border="25,5,25,5">ShutdownButtonFocus.png</alttexturefocus>
 				<alttexturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</alttexturenofocus>
 				<onclick>mastermode</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<visible>System.HasLocks</visible>
 			</control>
@@ -257,7 +257,7 @@
 				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>InhibitIdleShutdown(true)</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13017</label>
 				<visible>System.HasShutdown +!System.IsInhibit</visible>
@@ -273,7 +273,7 @@
 				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
 				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
 				<onclick>InhibitIdleShutdown(false)</onclick>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<font>font13</font>
 				<label>13018</label>
 				<visible>System.HasShutdown + System.IsInhibit</visible>
diff --git a/720p/DialogColorPicker.xml b/720p/DialogColorPicker.xml
index 568a6722..39d68c64 100644
--- a/720p/DialogColorPicker.xml
+++ b/720p/DialogColorPicker.xml
@@ -41,7 +41,7 @@
 				<width>980</width>
 				<height>30</height>
 				<font>font13_title</font>
-				<label>Colour</label>
+				<label>$LOCALIZE[737]</label>
 				<align>center</align>
 				<aligny>center</aligny>
 				<textcolor>selected</textcolor>
diff --git a/720p/DialogFavourites.xml b/720p/DialogFavourites.xml
deleted file mode 100644
index 86840a0c..00000000
--- a/720p/DialogFavourites.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog">
-	<defaultcontrol always="true">450</defaultcontrol>
-	<coordinates>
-		<left>0</left>
-		<top>0</top>
-	</coordinates>
-	<controls>
-		<control type="group">
-			<depth>DepthSideBlade</depth>
-			<animation effect="slide" start="400,0" end="0,0" time="300" tween="quadratic" easing="out">WindowOpen</animation>
-			<animation effect="slide" start="0,0" end="400,0" time="300" tween="quadratic" easing="out">WindowClose</animation>
-			<control type="image">
-				<left>400r</left>
-				<top>0</top>
-				<width>420</width>
-				<height>720</height>
-				<texture border="15,0,0,0" flipx="true">HomeBladeSub.png</texture>
-			</control>
-			<control type="button">
-				<description>Close Window button</description>
-				<left>380r</left>
-				<top>0</top>
-				<width>64</width>
-				<height>32</height>
-				<label/>
-				<font/>
-				<onclick>PreviousMenu</onclick>
-				<texturefocus>DialogCloseButton-focus.png</texturefocus>
-				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<onleft>450</onleft>
-				<onright>450</onright>
-				<onup>450</onup>
-				<ondown>450</ondown>
-				<visible>system.getbool(input.enablemouse)</visible>
-			</control>
-			<control type="image">
-				<left>370r</left>
-				<top>30</top>
-				<width>200</width>
-				<height>200</height>
-				<aspectratio align="center">keep</aspectratio>
-				<fadetime>IconCrossfadeTime</fadetime>
-				<texture>$INFO[ListItem.Icon]</texture>
-				<bordertexture border="8">ThumbShadow.png</bordertexture>
-				<bordersize>8</bordersize>
-			</control>
-			<control type="list" id="450">
-				<left>390r</left>
-				<top>250</top>
-				<width>450</width>
-				<height>380</height>
-				<onup>450</onup>
-				<onleft>Dialog.Close(Favourites)</onleft>
-				<onright>450</onright>
-				<ondown>450</ondown>
-				<pagecontrol/>
-				<scrolltime>200</scrolltime>
-				<itemlayout height="40">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>370</width>
-						<height>40</height>
-						<texture border="5">button-nofocus.png</texture>
-					</control>
-					<control type="label">
-						<left>10</left>
-						<top>0</top>
-						<width>350</width>
-						<height>40</height>
-						<font>font12_title</font>
-						<align>left</align>
-						<aligny>center</aligny>
-						<selectedcolor>selected</selectedcolor>
-						<info>ListItem.Label</info>
-					</control>
-				</itemlayout>
-				<focusedlayout height="40">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>370</width>
-						<height>40</height>
-						<visible>!Control.HasFocus(450)</visible>
-						<texture border="3">button-nofocus.png</texture>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>370</width>
-						<height>40</height>
-						<visible>Control.HasFocus(450)</visible>
-						<texture border="3">button-focus.png</texture>
-					</control>
-					<control type="label">
-						<left>10</left>
-						<top>0</top>
-						<width>350</width>
-						<height>40</height>
-						<font>font12_title</font>
-						<align>left</align>
-						<aligny>center</aligny>
-						<selectedcolor>selected</selectedcolor>
-						<info>ListItem.Label</info>
-					</control>
-				</focusedlayout>
-			</control>
-			<control type="label">
-				<description>Page label</description>
-				<right>30</right>
-				<top>670</top>
-				<width>350</width>
-				<height>30</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<textcolor>grey</textcolor>
-				<label>([COLOR=blue]$INFO[Container(450).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(450).CurrentPage]/$INFO[Container(450).NumPages][/COLOR])</label>
-			</control>
-		</control>
-	</controls>
-</window>
diff --git a/720p/DialogGameControllers.xml b/720p/DialogGameControllers.xml
index 2a3f7619..3dae61f8 100644
--- a/720p/DialogGameControllers.xml
+++ b/720p/DialogGameControllers.xml
@@ -7,211 +7,7 @@
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
-		<include content="DialogBackgroundCommons">
-			<param name="DialogBackgroundWidth" value="1120" />
-			<param name="DialogBackgroundHeight" value="590" />
-			<param name="DialogHeaderWidth" value="1020" />
-			<param name="DialogHeaderLabel" value="35058" />
-			<param name="DialogHeaderId" value="2" />
-			<param name="CloseButtonLeft" value="1030" />
-			<param name="CloseButtonNav" value="3" />
-		</include>
-		<control type="group" id="9000">
-			<left>20</left>
-			<top>60</top>
-			<control type="label">
-				<description>Controller types heading</description>
-				<top>5</top>
-				<left>30</left>
-				<width>220</width>
-				<height>25</height>
-				<font>font12</font>
-				<label>35050</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>blue</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="scrollbar" id="30">
-				<left>0</left>
-				<top>40</top>
-				<width>25</width>
-				<height>405</height>
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-				<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-				<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-				<textureslidernib/>
-				<textureslidernibfocus/>
-				<onleft>50</onleft>
-				<onright>3</onright>
-				<ondown>3</ondown>
-				<onup>3</onup>
-				<showonepage>false</showonepage>
-				<orientation>vertical</orientation>
-			</control>
-			<control type="grouplist" id="3">
-				<description>Controller types grouplist</description>
-				<left>30</left>
-				<top>40</top>
-				<width>220</width>
-				<height>405</height>
-				<onleft>30</onleft>
-				<onright>5</onright>
-				<onup>9001</onup>
-				<ondown>9001</ondown>
-				<pagecontrol>30</pagecontrol>
-			</control>
-			<control type="button" id="10">
-				<description>Default controller types button</description>
-				<height>40</height>
-				<width>220</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<textcolor>white</textcolor>
-				<pulseonselect>false</pulseonselect>
-			</control>
-			<control type="gamecontroller" id="31">
-				<left>300</left>
-				<top>90</top>
-				<width>480</width>
-				<height>286</height>
-				<include>VisibleFadeEffect</include>
-			</control>
-			<control type="label">
-				<description>Feature types heading</description>
-				<top>5</top>
-				<left>828</left>
-				<width>220</width>
-				<height>25</height>
-				<font>font12</font>
-				<label>35059</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>blue</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="scrollbar" id="50">
-				<left>1053</left>
-				<top>40</top>
-				<width>25</width>
-				<height>405</height>
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-				<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
-				<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-				<textureslidernib/>
-				<textureslidernibfocus/>
-				<onleft>5</onleft>
-				<onright>30</onright>
-				<ondown>5</ondown>
-				<onup>5</onup>
-				<showonepage>false</showonepage>
-				<orientation>vertical</orientation>
-			</control>
-			<control type="grouplist" id="5">
-				<description>Feature types grouplist</description>
-				<left>828</left>
-				<top>40</top>
-				<width>220</width>
-				<height>405</height>
-				<onleft>3</onleft>
-				<onright>50</onright>
-				<onup>9001</onup>
-				<ondown>9001</ondown>
-				<pagecontrol>50</pagecontrol>
-			</control>
-			<control type="button" id="7">
-				<description>Default feature types button</description>
-				<height>40</height>
-				<width>220</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<textcolor>white</textcolor>
-				<pulseonselect>false</pulseonselect>
-			</control>
-			<control type="label" id="8">
-				<description>Default feature types label</description>
-				<height>40</height>
-				<width>220</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<textcolor>grey</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-		</control>
-		<control type="group" id="9001">
-			<left>145</left>
-			<top>525</top>
-			<control type="button" id="18">
-				<description>Ok Button</description>
-				<left>0</left>
-				<top>0</top>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>186</label>
-				<font>font12_title</font>
-				<onleft>17</onleft>
-				<onright>19</onright>
-				<onup>9000</onup>
-				<ondown>9000</ondown>
-			</control>
-			<control type="button" id="19">
-				<description>Reset Button</description>
-				<left>210</left>
-				<top>0</top>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>10035</label>
-				<font>font12_title</font>
-				<onleft>18</onleft>
-				<onright>20</onright>
-				<onup>9000</onup>
-				<ondown>9000</ondown>
-			</control>
-			<control type="button" id="20">
-				<description>Link to install more controllers</description>
-				<left>420</left>
-				<top>0</top>
-				<height>40</height>
-				<width>200</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<textcolor>white</textcolor>
-				<pulseonselect>false</pulseonselect>
-				<label>$LOCALIZE[21452]</label>
-				<onleft>19</onleft>
-				<onright>17</onright>
-				<onup>9000</onup>
-				<ondown>9000</ondown>
-			</control>
-			<control type="button" id="17">
-				<description>Help button</description>
-				<left>630</left>
-				<top>0</top>
-				<height>40</height>
-				<width>200</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font12_title</font>
-				<textcolor>white</textcolor>
-				<pulseonselect>false</pulseonselect>
-				<label>$LOCALIZE[10043]</label>
-				<onleft>20</onleft>
-				<onright>18</onright>
-				<onup>9000</onup>
-				<ondown>9000</ondown>
-			</control>
-		</control>
+		<include condition="Window.IsActive(gamecontrollers)">DialogGameControllers</include>
+		<include condition="Window.IsActive(gameports)">DialogGamePorts</include>
 	</controls>
 </window>
diff --git a/720p/DialogKeyboard.xml b/720p/DialogKeyboard.xml
index 083e6b27..c4feee60 100644
--- a/720p/DialogKeyboard.xml
+++ b/720p/DialogKeyboard.xml
@@ -298,7 +298,7 @@
 						<height>50</height>
 						<label>20179</label>
 						<onup>302</onup>
-						<ondown>307</ondown>
+						<ondown>304</ondown>
 						<texturenofocus border="3">KeyboardKeyNF.png</texturenofocus>
 						<texturefocus border="5">KeyboardKey.png</texturefocus>
 						<radioposy>5</radioposy>
@@ -387,6 +387,42 @@
 					<top>150</top>
 					<itemgap>0</itemgap>
 					<orientation>horizontal</orientation>
+					<control type="radiobutton" id="310">
+						<description>Show Password button</description>
+						<width>50</width>
+						<height>50</height>
+						<onup>303</onup>
+						<ondown>300</ondown>
+						<font/>
+						<radiowidth>24</radiowidth>
+						<radioheight>24</radioheight>
+						<textureradioonfocus>password-radiobutton-focus.png</textureradioonfocus>
+						<textureradioonnofocus>password-radiobutton-focus.png</textureradioonnofocus>
+						<textureradioofffocus>password-radiobutton-nofocus.png</textureradioofffocus>
+						<textureradiooffnofocus>password-radiobutton-nofocus.png</textureradiooffnofocus>
+						<texturenofocus border="3">KeyboardKeyNF.png</texturenofocus>
+						<texturefocus border="5">KeyboardKey.png</texturefocus>
+						<align>center</align>
+						<aligny>center</aligny>
+						<focusedcolor>black</focusedcolor>
+						<radioposx>13</radioposx>
+					</control>
+					<control type="button" id="999">
+						<description>IP Input button</description>
+						<width>50</width>
+						<height>50</height>
+						<onup>303</onup>
+						<ondown>300</ondown>
+						<onclick>SendClick(307)</onclick>
+						<label>IP</label>
+						<texturenofocus border="3">KeyboardKeyNF.png</texturenofocus>
+						<texturefocus border="5">KeyboardKey.png</texturefocus>
+						<align>center</align>
+						<aligny>center</aligny>
+						<font>font13</font>
+						<focusedcolor>black</focusedcolor>
+						<visible>Control.IsVisible(310)</visible>
+					</control>
 					<control type="button" id="307">
 						<description>IP Input button</description>
 						<width>100</width>
@@ -400,6 +436,7 @@
 						<aligny>center</aligny>
 						<font>font13</font>
 						<focusedcolor>black</focusedcolor>
+						<visible>!Control.IsVisible(310)</visible>
 					</control>
 					<control type="radiobutton" id="304">
 						<description>Symbols button</description>
diff --git a/720p/DialogMusicInfo.xml b/720p/DialogMusicInfo.xml
index f71e164d..df984f6a 100644
--- a/720p/DialogMusicInfo.xml
+++ b/720p/DialogMusicInfo.xml
@@ -57,7 +57,7 @@
 						<width>270</width>
 						<height>270</height>
 						<aspectratio>keep</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true">$INFO[ListItem.Icon]</texture>
 					</control>
diff --git a/720p/DialogPVRChannelManager.xml b/720p/DialogPVRChannelManager.xml
index 841e6d28..a620d5d7 100644
--- a/720p/DialogPVRChannelManager.xml
+++ b/720p/DialogPVRChannelManager.xml
@@ -227,7 +227,7 @@
 					<aligny>center</aligny>
 					<texturefocus border="5">button-focus2.png</texturefocus>
 					<texturenofocus border="5">button-nofocus.png</texturenofocus>
-					<pulseonselect>no</pulseonselect>
+					<pulseonselect>false</pulseonselect>
 					<label>19074</label>
 				</control>
 				<control type="edit" id="8">
@@ -288,7 +288,7 @@
 					<aligny>center</aligny>
 					<texturefocus border="5">button-focus2.png</texturefocus>
 					<texturenofocus border="5">button-nofocus.png</texturenofocus>
-					<pulseonselect>no</pulseonselect>
+					<pulseonselect>false</pulseonselect>
 					<label>19206</label>
 				</control>
 				<control type="spincontrolex" id="13">
@@ -316,7 +316,7 @@
 					<aligny>center</aligny>
 					<texturefocus border="5">button-focus2.png</texturefocus>
 					<texturenofocus border="5">button-nofocus.png</texturenofocus>
-					<pulseonselect>no</pulseonselect>
+					<pulseonselect>false</pulseonselect>
 					<label>19267</label>
 				</control>
 			</control>
diff --git a/720p/DialogPVRGuideControls.xml b/720p/DialogPVRGuideControls.xml
index 3020a666..67bcd6c4 100644
--- a/720p/DialogPVRGuideControls.xml
+++ b/720p/DialogPVRGuideControls.xml
@@ -3,12 +3,10 @@
 	<defaultcontrol always="false">602</defaultcontrol>
 	<include>dialogeffect</include>
 	<depth>DepthOSD</depth>
-	
 	<coordinates>
 		<left>0</left>
 		<top>0</top>
 	</coordinates>
-
 	<controls>
 		<control type="image">
 			<left>-20</left>
@@ -17,7 +15,6 @@
 			<height>130</height>
 			<texture border="1">HomeNowPlayingBack.png</texture>
 		</control>
-		
 		<control type="label">
 			<left>100</left>
 			<top>150r</top>
@@ -25,11 +22,9 @@
 			<align>center</align>
 			<font>font12</font>
 			<textcolor>grey</textcolor>
-			<align>left</align>
 			<aligny>center</aligny>
 			<label>$LOCALIZE[19325]</label>
 		</control>
-		
 		<control type="grouplist" id="201">
 			<left>100</left>
 			<top>60r</top>
@@ -83,7 +78,6 @@
 				<onclick>PVR.EpgGridControl(SelectDate)</onclick>
 			</control>
 		</control>
-		
 		<control type="label">
 			<left>100</left>
 			<top>60r</top>
@@ -91,11 +85,8 @@
 			<align>center</align>
 			<aligny>center</aligny>
 			<font>font13</font>
-			<align>left</align>
-			<aligny>center</aligny>
 			<label>$VAR[PVRGuideControlsHelpTextVar]</label>
 		</control>
-		
 		<control type="label">
 			<left>810</left>
 			<top>150r</top>
@@ -103,11 +94,9 @@
 			<align>center</align>
 			<font>font12</font>
 			<textcolor>grey</textcolor>
-			<align>left</align>
 			<aligny>center</aligny>
 			<label>$LOCALIZE[19148]</label>
 		</control>
-		
 		<control type="grouplist" id="202">
 			<left>810</left>
 			<top>60r</top>
@@ -143,7 +132,6 @@
 				<onclick>PVR.EpgGridControl(FirstProgramme)</onclick>
 			</control>
 		</control>
-		
 		<control type="label">
 			<left>1015</left>
 			<top>150r</top>
@@ -151,11 +139,9 @@
 			<align>center</align>
 			<font>font12</font>
 			<textcolor>grey</textcolor>
-			<align>left</align>
 			<aligny>center</aligny>
 			<label>$LOCALIZE[19141]</label>
 		</control>
-		
 		<control type="grouplist" id="203">
 			<left>1015</left>
 			<top>60r</top>
@@ -189,4 +175,4 @@
 			</control>
 		</control>
 	</controls>
-</window>
\ No newline at end of file
+</window>
diff --git a/720p/DialogPVRGuideSearch.xml b/720p/DialogPVRGuideSearch.xml
index fc4ae49d..a05a12e3 100644
--- a/720p/DialogPVRGuideSearch.xml
+++ b/720p/DialogPVRGuideSearch.xml
@@ -173,7 +173,7 @@
 				<aligny>center</aligny>
 				<texturefocus border="5">button-focus2.png</texturefocus>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<label>19132</label>
 				<onleft>21</onleft>
 				<onright>21</onright>
@@ -194,7 +194,7 @@
 				<aligny>center</aligny>
 				<texturefocus border="5">button-focus2.png</texturefocus>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<label>19123</label>
 				<onleft>23</onleft>
 				<onright>23</onright>
@@ -215,7 +215,7 @@
 				<aligny>center</aligny>
 				<texturefocus border="5">button-focus2.png</texturefocus>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<label>19124</label>
 				<onleft>27</onleft>
 				<onright>27</onright>
@@ -306,7 +306,7 @@
 				<aligny>center</aligny>
 				<texturefocus border="5">button-focus2.png</texturefocus>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<label>19121</label>
 				<onright>18</onright>
 				<onleft>18</onleft>
@@ -357,7 +357,7 @@
 				<aligny>center</aligny>
 				<texturefocus border="5">button-focus2.png</texturefocus>
 				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<label>19125</label>
 				<onleft>24</onleft>
 				<onright>24</onright>
diff --git a/720p/DialogPVRRadioRDSInfo.xml b/720p/DialogPVRRadioRDSInfo.xml
index f609ef0a..68b2f975 100644
--- a/720p/DialogPVRRadioRDSInfo.xml
+++ b/720p/DialogPVRRadioRDSInfo.xml
@@ -895,7 +895,7 @@
 				<font>font13</font>
 				<textcolor>white</textcolor>
 				<aligny>center</aligny>
-				<label/>
+				<font/>
 				<textoffsetx>10</textoffsetx>
 				<onright>21</onright>
 				<onleft>21</onleft>
diff --git a/720p/DialogPlayerProcessInfo.xml b/720p/DialogPlayerProcessInfo.xml
index 8d8ad9a0..936927c1 100644
--- a/720p/DialogPlayerProcessInfo.xml
+++ b/720p/DialogPlayerProcessInfo.xml
@@ -139,7 +139,7 @@
 				<width>450</width>
 				<height>25</height>
 				<scroll>true</scroll>
-				<label fallback="1446">$INFO[Player.Process(videowidth),,x]$INFO[Player.Process(videoheight),, px]$INFO[Player.Process(videodar),$COMMA , AR]$INFO[Player.Process(videofps),$COMMA , FPS]</label>
+				<label fallback="1446">$INFO[Player.Process(videowidth),,x]$INFO[Player.Process(videoheight)]$INFO[Player.Process(videoscantype)]$INFO[Player.Process(videodar),$COMMA , AR]$INFO[Player.Process(videofps),$COMMA , FPS]</label>
 				<align>left</align>
 				<aligny>center</aligny>
 				<font>font12</font>
diff --git a/720p/DialogSelect.xml b/720p/DialogSelect.xml
index 2ba096f0..d4a235b9 100644
--- a/720p/DialogSelect.xml
+++ b/720p/DialogSelect.xml
@@ -4,7 +4,8 @@
 	<include>dialogeffect</include>
 	<depth>DepthDialog+</depth>
 	<controls>
-		<include condition="Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)">GameDialogSelectLayout</include>
-		<include condition="![Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation)]">DefaultDialogSelectLayout</include>
+		<include condition="![Window.IsActive(gamesaves) | Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)]">DialogDefaultSelectLayout</include>
+		<include condition="Window.IsActive(gamestretchmode) | Window.IsActive(gamevideofilter) | Window.IsActive(gamevideorotation) | Window.IsActive(ingamesaves)">DialogGameSelectLayout</include>
+		<include condition="Window.IsActive(gamesaves)">DialogGameSelectSaveLayout</include>
 	</controls>
 </window>
diff --git a/720p/DialogSlider.xml b/720p/DialogSlider.xml
index f7b670f8..e41cf317 100644
--- a/720p/DialogSlider.xml
+++ b/720p/DialogSlider.xml
@@ -44,9 +44,6 @@
 			<top>35</top>
 			<width>420</width>
 			<height>20</height>
-			<aligny>center</aligny>
-			<texturefocus/>
-			<texturenofocus/>
 			<texturesliderbar>osd_slider_bg_2.png</texturesliderbar>
 			<textureslidernib>osd_slider_nibNF.png</textureslidernib>
 			<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
diff --git a/720p/DialogVideoInfo.xml b/720p/DialogVideoInfo.xml
index f26307d3..7ded3ced 100644
--- a/720p/DialogVideoInfo.xml
+++ b/720p/DialogVideoInfo.xml
@@ -118,7 +118,7 @@
 						<width>270</width>
 						<height>380</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 					</control>
@@ -292,7 +292,7 @@
 						<width>270</width>
 						<height>380</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 					</control>
@@ -378,6 +378,11 @@
 							</control>
 						</focusedlayout>
 						<content>
+							<item>
+								<label>$LOCALIZE[20376]:</label>
+								<label2>$INFO[ListItem.OriginalTitle]</label2>
+								<visible>!String.IsEmpty(ListItem.OriginalTitle) + !String.IsEqual(ListItem.OriginalTitle,Listitem.Title)</visible>
+							</item>
 							<item>
 								<label>$LOCALIZE[20360]:</label>
 								<label2>$INFO[listitem.episode] [COLOR=grey] ($INFO[ListItem.Property(WatchedEpisodes),, $LOCALIZE[16102]] - $INFO[ListItem.Property(UnWatchedEpisodes), , $LOCALIZE[16101]])[/COLOR]</label2>
@@ -435,7 +440,7 @@
 						<width>380</width>
 						<height>250</height>
 						<aspectratio aligny="bottom">keep</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true">$INFO[ListItem.Icon]</texture>
 					</control>
@@ -445,7 +450,7 @@
 						<width>380</width>
 						<height>250</height>
 						<aspectratio aligny="top">keep</aspectratio>
-						<bordertexture border="5" flipy="true" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5" flipy="true" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$INFO[ListItem.Icon]</texture>
 					</control>
@@ -605,7 +610,7 @@
 						<width>380</width>
 						<height>360</height>
 						<aspectratio>keep</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true">$INFO[ListItem.Icon]</texture>
 					</control>
diff --git a/720p/EventLog.xml b/720p/EventLog.xml
index ff95e491..97379f58 100644
--- a/720p/EventLog.xml
+++ b/720p/EventLog.xml
@@ -60,7 +60,7 @@
 						<height>76</height>
 						<texture>$INFO[Listitem.Icon]</texture>
 						<aspectratio>keep</aspectratio>
-						<bordertexture border="3">black-back2.png</bordertexture>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
 						<bordersize>2</bordersize>
 					</control>
 					<control type="label">
@@ -125,7 +125,7 @@
 						<height>76</height>
 						<texture>$INFO[Listitem.Icon]</texture>
 						<aspectratio>keep</aspectratio>
-						<bordertexture border="3">black-back2.png</bordertexture>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
 						<bordersize>2</bordersize>
 					</control>
 					<control type="label">
diff --git a/720p/FileManager.xml b/720p/FileManager.xml
index 5a5dd1e7..6eb8e820 100644
--- a/720p/FileManager.xml
+++ b/720p/FileManager.xml
@@ -44,7 +44,7 @@
 				<height>80</height>
 				<aspectratio>keep</aspectratio>
 				<info>Container(20).ListItem.Icon</info>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
+				<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 				<bordersize>3</bordersize>
 			</control>
 			<control type="label">
@@ -218,7 +218,7 @@
 				<height>80</height>
 				<aspectratio>keep</aspectratio>
 				<info>Container(21).ListItem.Icon</info>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
+				<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 				<bordersize>3</bordersize>
 			</control>
 			<control type="label">
diff --git a/720p/GameOSD.xml b/720p/GameOSD.xml
index 245159dc..44d30dae 100644
--- a/720p/GameOSD.xml
+++ b/720p/GameOSD.xml
@@ -4,17 +4,17 @@
 	<include>dialogeffect</include>
 	<coordinates>
 		<left>470</left>
-		<top>147</top>
+		<top>85</top>
 	</coordinates>
 	<controls>
 		<control type="group">
-			<visible>!Window.IsActive(GameVideoFilter) + !Window.IsActive(gamestretchmode) + !Window.IsActive(GameVideoRotation) + !Window.IsActive(GameControllers)</visible>
+			<visible>!Window.IsActive(GameVideoFilter) + !Window.IsActive(gamestretchmode) + !Window.IsActive(GameVideoRotation) + !Window.IsActive(GameControllers)+ !Window.IsActive(InGameSaves)</visible>
 			<control type="image">
 				<description>background image</description>
 				<left>0</left>
 				<top>0</top>
 				<width>340</width>
-				<height>470</height>
+				<height>554</height>
 				<texture border="20">DialogBack.png</texture>
 			</control>
 			<control type="image">
@@ -43,7 +43,7 @@
 				<left>20</left>
 				<top>70</top>
 				<width>300</width>
-				<height>380</height>
+				<height>466</height>
 				<itemgap>4</itemgap>
 				<control type="button" id="1001">
 					<description>Resume button</description>
@@ -54,9 +54,20 @@
 					<focusedcolor>white</focusedcolor>
 					<texturefocus border="5">button-focus.png</texturefocus>
 					<label>$LOCALIZE[13404]</label>
-					<label2>Select + X</label2>
+					<label2>$LOCALIZE[31037]</label2>
 					<onclick>Play</onclick>
 				</control>
+				<control type="button" id="1011">
+					<description>Save button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[15314]</label>
+					<onclick>ActivateWindow(InGameSaves)</onclick>
+				</control>
 				<control type="button" id="1002">
 					<description>Reset button</description>
 					<width>300</width>
@@ -77,7 +88,7 @@
 					<focusedcolor>white</focusedcolor>
 					<texturefocus border="5">button-focus.png</texturefocus>
 					<label>$LOCALIZE[35222]</label>
-					<label2>Select + Start</label2>
+					<label2>$LOCALIZE[31038]</label2>
 					<onclick>Stop</onclick>
 				</control>
 				<control type="button" id="1004">
@@ -89,7 +100,7 @@
 					<focusedcolor>white</focusedcolor>
 					<texturefocus border="5">button-focus.png</texturefocus>
 					<label>13376</label>
-					<label2>Select + Right Stick</label2>
+					<label2>$LOCALIZE[31041]</label2>
 					<onclick>ActivateWindow(GameVolume)</onclick>
 				</control>
 				<control type="image" id="1005">
@@ -145,6 +156,18 @@
 					<label>$LOCALIZE[35234]</label>
 					<onclick>ActivateWindow(gamecontrollers)</onclick>
 				</control>
+				<control type="button" id="1012">
+					<description>Controller port button</description>
+					<width>300</width>
+					<height>38</height>
+					<font>fontContextMenu</font>
+					<align>center</align>
+					<textcolor>grey2</textcolor>
+					<focusedcolor>white</focusedcolor>
+					<texturefocus border="5">button-focus.png</texturefocus>
+					<label>$LOCALIZE[35110]</label>
+					<onclick>ActivateWindow(GamePorts)</onclick>
+				</control>
 				<control type="button" id="1010">
 					<description>Advanced settings button</description>
 					<width>300</width>
diff --git a/720p/Home.xml b/720p/Home.xml
index b831581e..b44c0018 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<onload condition="String.IsEmpty(Skin.String(DefaultHomeFocusItem))">SetProperty(SetDefaultHomeItem,1,home)</onload>
+	<onload condition="Window.Previous(startup)">SetFocus(9000,$INFO[Skin.String(DefaultHomeFocus)])</onload>
 	<onunload condition="Container(9000).Hasfocus(10) | Container(9000).Hasfocus(11) | ControlGroup(9010).HasFocus | ControlGroup(9016).HasFocus | ControlGroup(9017).HasFocus">SetProperty(VideosDirectLink,True)</onunload>
 	<onunload condition="ControlGroup(9011).HasFocus">SetProperty(MusicDirectLink,True)</onunload>
 	<onunload condition="Control.HasFocus(9000) + Container(9000).Hasfocus(2)">ClearProperty(VideosDirectLink)</onunload>
@@ -74,7 +76,7 @@
 				<height>295</height>
 				<aspectratio aligny="bottom">keep</aspectratio>
 				<texture fallback="DefaultAlbumCover.png">$INFO[Player.Art(thumb)]</texture>
-				<bordertexture border="8">ThumbBorder.png</bordertexture>
+				<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 				<bordersize>5</bordersize>
 			</control>
 			<control type="label">
@@ -143,7 +145,7 @@
 					<height>80</height>
 					<aspectratio>keep</aspectratio>
 					<texture background="true" fallback="DefaultVideoCover.png">$INFO[PVR.NextRecordingChannelIcon]</texture>
-					<bordertexture border="8">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 					<bordersize>4</bordersize>
 				</control>
 				<control type="image">
@@ -210,7 +212,7 @@
 					<height>80</height>
 					<aspectratio>keep</aspectratio>
 					<texture background="true" fallback="DefaultVideoCover.png">$INFO[PVR.NowRecordingChannelIcon]</texture>
-					<bordertexture border="8">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 					<bordersize>4</bordersize>
 				</control>
 				<control type="image">
@@ -280,7 +282,7 @@
 					<height>300</height>
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<texture fallback="DefaultVideoCover.png">$VAR[NowPlayingThumb]</texture>
-					<bordertexture border="8">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 					<bordersize>5</bordersize>
 				</control>
 				<control type="label">
@@ -320,7 +322,7 @@
 					<height>300</height>
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<texture fallback="DefaultVideoCover.png">$VAR[NowPlayingThumb]</texture>
-					<bordertexture border="8">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 					<bordersize>5</bordersize>
 				</control>
 				<control type="label">
@@ -388,7 +390,7 @@
 					<height>300</height>
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<texture fallback="DefaultVideoCover.png">$VAR[NowPlayingThumb]</texture>
-					<bordertexture border="8">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 					<bordersize>5</bordersize>
 				</control>
 				<control type="label">
@@ -441,7 +443,7 @@
 					<height>120</height>
 					<aspectratio>scale</aspectratio>
 					<texture fallback="DefaultVideoCover.png">$INFO[Player.Art(thumb)]</texture>
-					<bordertexture border="8">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 					<bordersize>5</bordersize>
 				</control>
 				<control type="label">
@@ -878,7 +880,8 @@
 				<height>60</height>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
-				<onup>601</onup>
+				<onup condition="String.IsEmpty(Window(home).Property(SetDefaultHomeItem))">601</onup>
+				<onup condition="!String.IsEmpty(Window(home).Property(SetDefaultHomeItem))">9999</onup>
 				<ondown>9001</ondown>
 				<pagecontrol/>
 				<scrolltime>300</scrolltime>
@@ -980,14 +983,14 @@
 						<onclick>ActivateWindow(RadioChannels)</onclick>
 						<icon/>
 						<thumb/>
-						<visible>PVR.HasRadioChannels</visible>
+						<visible>[!Skin.HasSetting(HomeMenuNoRadioButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoRadioButton) + System.IsMaster]</visible>
 					</item>
 					<item id="12">
 						<label>31952</label>
 						<onclick>ActivateWindow(TVChannels)</onclick>
 						<icon/>
 						<thumb/>
-						<visible>PVR.HasTVChannels</visible>
+						<visible>[!Skin.HasSetting(HomeMenuNoTVButton) + !System.IsMaster] | [!Skin.HasSetting(MasterHomeMenuNoTVsButton) + System.IsMaster]</visible>
 					</item>
 					<item id="2">
 						<label>31953</label>
@@ -1345,5 +1348,34 @@
 				<animation effect="slide" start="0,0" end="-40,0" time="75" condition="Player.Muted">conditional</animation>
 			</control>
 		</control>
+		<control type="button" id="9999">
+			<centerleft>50%</centerleft>
+			<top>320</top>
+			<width>500</width>
+			<height>42</height>
+			<align>center</align>
+			<aligny>center</aligny>
+			<shadowcolor>black</shadowcolor>
+			<texturefocus/>
+			<texturenofocus/>
+			<font>font16</font>
+			<label>$LOCALIZE[31019]</label>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,1)">Skin.SetString(DefaultHomeFocus,0)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,2)">Skin.SetString(DefaultHomeFocus,1)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,3)">Skin.SetString(DefaultHomeFocus,2)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,4)">Skin.SetString(DefaultHomeFocus,3)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,5)">Skin.SetString(DefaultHomeFocus,4)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,6)">Skin.SetString(DefaultHomeFocus,5)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,7)">Skin.SetString(DefaultHomeFocus,6)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,8)">Skin.SetString(DefaultHomeFocus,7)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,9)">Skin.SetString(DefaultHomeFocus,8)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,10)">Skin.SetString(DefaultHomeFocus,9)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,11)">Skin.SetString(DefaultHomeFocus,10)</onfocus>
+			<onfocus condition="String.IsEqual(Container(9000).CurrentItem,12)">Skin.SetString(DefaultHomeFocus,11)</onfocus>
+			<onfocus>Skin.SetString(DefaultHomeFocusItem,$INFO[Container(9000).ListItem.Label])</onfocus>
+			<onfocus>ClearProperty(SetDefaultHomeItem,home)</onfocus>
+			<onfocus condition="Window.Previous(skinsettings)">ActivateWindow(skinsettings)</onfocus>
+			<visible>!String.IsEmpty(Window(home).Property(SetDefaultHomeItem))</visible>
+		</control>
 	</controls>
 </window>
diff --git a/720p/Includes.xml b/720p/Includes.xml
index f3ceffdc..2c8e8696 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 	<include file="Defaults.xml" />
-	<include file="Includes_DialogSelect.xml" />
 	<include file="ViewsVideoLibrary.xml" />
 	<include file="ViewsMusicLibrary.xml" />
 	<include file="ViewsFileMode.xml" />
@@ -10,7 +9,9 @@
 	<include file="ViewsLiveTV.xml" />
 	<include file="ViewsPVRGuide.xml" />
 	<include file="ViewsWeather.xml" />
+	<include file="IncludesDialogSelect.xml" />
 	<include file="IncludesCodecFlagging.xml" />
+	<include file="IncludesGames.xml" />
 	<include file="IncludesHomeRecentlyAdded.xml" />
 	<include file="IncludesHomeMenuItems.xml" />
 	<include file="IncludesPVR.xml" />
@@ -39,19 +40,6 @@
 	<constant name="DepthFloor">-0.20</constant>
 	<constant name="DepthSideBlade">0.15</constant>
 	<!-- VARIABLES -->
-	<variable name="MusicRating">
-		<value condition="Integer.IsGreater(ListItem.Rating,9.5)">10</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,8.5)">9</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,7.5)">8</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,6.5)">7</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,5.5)">6</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,4.5)">5</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,3.5)">4</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,2.5)">3</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,1.5)">2</value>
-		<value condition="Integer.IsGreater(ListItem.Rating,0.5)">1</value>
-		<value>0</value>
-	</variable>
 	<variable name="AddonInfoHeading">
 		<value condition="!String.IsEmpty(Window(home).Property(WhatsNew))">$LOCALIZE[24054]</value>
 		<value>$LOCALIZE[21821]</value>
@@ -68,6 +56,7 @@
 		<value condition="Window.IsActive(gamevideofilter)">$LOCALIZE[230]</value>
 		<value condition="Window.IsActive(gamestretchmode)">$LOCALIZE[35233]</value>
 		<value condition="Window.IsActive(gamevideorotation)">$LOCALIZE[35227]</value>
+		<value condition="Window.IsActive(ingamesaves)">$LOCALIZE[31020]</value>
 	</variable>
 	<variable name="DurationInMinutes">
 		<value condition="String.StartsWith(ListItem.Duration,01:00:)">60 $LOCALIZE[12391]</value>
@@ -598,6 +587,18 @@
 		<value condition="Skin.HasSetting(show_profileavatar)">$LOCALIZE[31964]</value>
 		<value>$LOCALIZE[16018]</value>
 	</variable>
+	<variable name="ShowOriginalName">
+		<value condition="Skin.HasSetting(TitleFormat_1st)">$LOCALIZE[31035]</value>
+		<value condition="Skin.HasSetting(TitleFormat_2nd)">$LOCALIZE[31034]</value>
+		<value condition="Skin.HasSetting(TitleFormat_only)">$LOCALIZE[31036]</value>
+		<value>$LOCALIZE[31030]</value>
+	</variable>
+	<variable name="ShowCustomLabel">
+		<value condition="Skin.HasSetting(TitleFormat_1st) + !String.IsEmpty(ListItem.OriginalTitle) + !String.IsEqual(ListItem.Label,ListItem.OriginalTitle)">$INFO[ListItem.OriginalTitle] ($INFO[ListItem.Label])</value>
+		<value condition="Skin.HasSetting(TitleFormat_2nd) + !String.IsEmpty(ListItem.OriginalTitle) + !String.IsEqual(ListItem.Label,ListItem.OriginalTitle)">$INFO[ListItem.Label] ($INFO[ListItem.OriginalTitle])</value>
+		<value condition="Skin.HasSetting(TitleFormat_only) + !String.IsEmpty(ListItem.OriginalTitle) + !String.IsEqual(ListItem.Label,ListItem.OriginalTitle)">$INFO[ListItem.OriginalTitle]</value>
+		<value>$INFO[ListItem.Label]</value>
+	</variable>
 	<!-- INCLUDES -->
 	<include name="MusicInfoPanel">
 		<control type="panel" id="50">
@@ -1616,7 +1617,7 @@
 				<width>180</width>
 				<height>120</height>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
+				<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 				<bordersize>3</bordersize>
 				<texture background="true">$INFO[ListItem.Icon]</texture>
 			</control>
@@ -1647,7 +1648,7 @@
 				<width>180</width>
 				<height>120</height>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="5">button-nofocus.png</bordertexture>
+				<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 				<bordersize>3</bordersize>
 				<texture background="true">$INFO[ListItem.Icon]</texture>
 				<visible>!ControlGroup(9002).HasFocus</visible>
@@ -1658,7 +1659,7 @@
 				<width>180</width>
 				<height>120</height>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="5">folder-focus.png</bordertexture>
+				<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 				<bordersize>3</bordersize>
 				<texture background="true">$INFO[ListItem.Icon]</texture>
 				<visible>ControlGroup(9002).HasFocus</visible>
diff --git a/720p/IncludesCodecFlagging.xml b/720p/IncludesCodecFlagging.xml
index c4e706cd..5d85f688 100644
--- a/720p/IncludesCodecFlagging.xml
+++ b/720p/IncludesCodecFlagging.xml
@@ -8,6 +8,14 @@
 			<aspectratio align="right">keep</aspectratio>
 			<texture>$INFO[ListItem.VideoResolution,flagging/video/,.png]</texture>
 		</control>
+		<control type="image">
+			<description>Codec Image</description>
+			<width>73</width>
+			<height>35</height>
+			<aspectratio align="left">keep</aspectratio>
+			<texture>$INFO[ListItem.HdrType,flagging/video/,.png]</texture>
+			<visible>!String.IsEmpty(ListItem.HdrType)</visible>
+		</control>
 		<control type="image">
 			<description>Codec Image</description>
 			<width>80</width>
diff --git a/720p/Includes_DialogSelect.xml b/720p/IncludesDialogSelect.xml
similarity index 65%
rename from 720p/Includes_DialogSelect.xml
rename to 720p/IncludesDialogSelect.xml
index e348fca4..38f48b9c 100644
--- a/720p/Includes_DialogSelect.xml
+++ b/720p/IncludesDialogSelect.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-	<include name="DefaultDialogSelectLayout">
+	<include name="DialogDefaultSelectLayout">
 		<control type="group">
 			<left>235</left>
 			<top>75</top>
@@ -78,8 +78,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label/>
-				<font/>
+				<label />
+				<font />
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -176,7 +176,7 @@
 						<height>80</height>
 						<texture>$VAR[DialogSelectImage]</texture>
 						<aspectratio>keep</aspectratio>
-						<bordertexture border="3">black-back2.png</bordertexture>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
 						<bordersize>2</bordersize>
 					</control>
 					<control type="label">
@@ -229,7 +229,7 @@
 						<height>80</height>
 						<texture>$VAR[DialogSelectImage]</texture>
 						<aspectratio>keep</aspectratio>
-						<bordertexture border="3">black-back2.png</bordertexture>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
 						<bordersize>2</bordersize>
 					</control>
 					<control type="label">
@@ -302,7 +302,7 @@
 						<description>Manual button</description>
 						<width>200</width>
 						<height>40</height>
-						<label/>
+						<label />
 						<font>font12_title</font>
 						<textcolor>white</textcolor>
 						<focusedcolor>white</focusedcolor>
@@ -312,7 +312,7 @@
 						<description>Cancel button</description>
 						<width>200</width>
 						<height>40</height>
-						<label/>
+						<label />
 						<font>font12_title</font>
 						<textcolor>white</textcolor>
 						<focusedcolor>white</focusedcolor>
@@ -322,7 +322,7 @@
 			</control>
 		</control>
 	</include>
-	<include name="GameDialogSelectLayout">
+	<include name="DialogGameSelectLayout">
 		<control type="group">
 			<left>20</left>
 			<top>408</top>
@@ -361,8 +361,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label/>
-				<font/>
+				<label />
+				<font />
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -372,20 +372,19 @@
 				<ondown>3</ondown>
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
-			<control type="panel" id="11">
+			<control type="panel" id="10811">
 				<left>20</left>
 				<top>65</top>
 				<width>1200</width>
 				<height>215</height>
-				<onleft>11</onleft>
-				<onright>11</onright>
+				<onleft>10811</onleft>
+				<onright>10811</onright>
 				<ondown>noop</ondown>
 				<onup>noop</onup>
 				<scrolltime>200</scrolltime>
 				<viewtype label="536">icon</viewtype>
 				<orientation>horizontal</orientation>
-				<pagecontrol/>
-				<orientation>vertical</orientation>
+				<pagecontrol />
 				<itemlayout height="215" width="240">
 					<control type="image">
 						<left>2</left>
@@ -399,8 +398,8 @@
 						<top>20</top>
 						<width>220</width>
 						<height>150</height>
-						<viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
 						<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
+						<stretchmode>$INFO[ListItem.Property(game.stretchmode)]</stretchmode>
 						<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
 					</control>
 					<control type="label">
@@ -428,8 +427,8 @@
 						<top>20</top>
 						<width>220</width>
 						<height>150</height>
-						<viewmode>$INFO[ListItem.Property(game.viewmode)]</viewmode>
 						<videofilter>$INFO[ListItem.Property(game.videofilter)]</videofilter>
+						<stretchmode>$INFO[ListItem.Property(game.stretchmode)]</stretchmode>
 						<rotation>$INFO[ListItem.Property(game.videorotation)]</rotation>
 					</control>
 					<control type="label">
@@ -447,4 +446,250 @@
 			</control>
 		</control>
 	</include>
+	<include name="DialogGameSelectSaveLayout">
+		<control type="group">
+			<left>235</left>
+			<top>121</top>
+			<control type="image">
+				<description>background image</description>
+				<left>0</left>
+				<top>0</top>
+				<width>850</width>
+				<height>458</height>
+				<texture border="40">DialogBack.png</texture>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<left>40</left>
+				<top>16</top>
+				<width>770</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label" id="1">
+				<description>header label</description>
+				<left>40</left>
+				<top>20</top>
+				<width>770</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[35260]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="label" id="4">
+				<description>No Settings Label</description>
+				<left>20</left>
+				<top>120</top>
+				<width>550</width>
+				<align>center</align>
+				<font>font13</font>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<left>760</left>
+				<top>15</top>
+				<width>64</width>
+				<height>32</height>
+				<label />
+				<font />
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
+			<control type="list" id="3">
+				<left>20</left>
+				<top>67</top>
+				<width>550</width>
+				<height>368</height>
+				<onup>6</onup>
+				<ondown>6</ondown>
+				<onleft>7</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<itemlayout height="92" width="550">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>86</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="image">
+						<left>2</left>
+						<top>3</top>
+						<width>80</width>
+						<height>80</height>
+						<texture>$INFO[ListItem.Art(screenshot)]</texture>
+						<aspectratio>keep</aspectratio>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
+						<bordersize>2</bordersize>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>12</top>
+						<width>450</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[B]$INFO[ListItem.Label][/B]</label>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>44</top>
+						<width>450</width>
+						<height>48</height>
+						<font>font12</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="92" width="550">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>86</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(3)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>550</width>
+						<height>86</height>
+						<texture border="5">button-focus2.png</texture>
+						<visible>Control.HasFocus(3)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>2</left>
+						<top>3</top>
+						<width>80</width>
+						<height>80</height>
+						<texture>$INFO[ListItem.Art(screenshot)]</texture>
+						<aspectratio>keep</aspectratio>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
+						<bordersize>2</bordersize>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>12</top>
+						<width>450</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[B]$INFO[ListItem.Label][/B]</label>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>44</top>
+						<width>450</width>
+						<height>48</height>
+						<font>font12</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+				</focusedlayout>
+			</control>
+			<control type="scrollbar" id="61">
+				<left>570</left>
+				<top>65</top>
+				<width>25</width>
+				<height>372</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft>3</onleft>
+				<onright>90</onright>
+				<ondown>61</ondown>
+				<onup>61</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="image">
+				<left>612</left>
+				<top>190</top>
+				<width>200</width>
+				<height>200</height>
+				<texture border="5">button-nofocus.png</texture>
+			</control>
+			<control type="label" id="10823">
+				<description>Emulator name</description>
+				<left>617</left>
+				<top>195</top>
+				<width>180</width>
+				<height>35</height>
+				<font>font12</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>blue</textcolor>
+			</control>
+			<control type="image" id="10824">
+				<description>Emulator icon</description>
+				<left>657</left>
+				<top>245</top>
+				<width>120</width>
+				<height>120</height>
+				<aspectratio>keep</aspectratio>
+			</control>
+			<control type="group">
+				<control type="label">
+					<description>number of files/pages in list text label</description>
+					<left>592</left>
+					<top>398</top>
+					<width>240</width>
+					<height>35</height>
+					<font>font12</font>
+					<align>center</align>
+					<aligny>center</aligny>
+					<textcolor>grey</textcolor>
+					<label>$VAR[SelectLabel]</label>
+				</control>
+				<control type="grouplist" id="90">
+					<left>612</left>
+					<top>100</top>
+					<onleft>3</onleft>
+					<onright>3</onright>
+					<control type="button" id="10825">
+						<description>New button</description>
+						<width>200</width>
+						<height>40</height>
+						<label>$LOCALIZE[35261]</label>
+						<font>font12_title</font>
+						<textcolor>white</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<align>center</align>
+					</control>
+					<control type="button" id="10826">
+						<description>Cancel button</description>
+						<width>200</width>
+						<height>40</height>
+						<label>$LOCALIZE[222]</label>
+						<font>font12_title</font>
+						<textcolor>white</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<align>center</align>
+					</control>
+				</control>
+			</control>
+		</control>
+	</include>
 </includes>
diff --git a/720p/IncludesGames.xml b/720p/IncludesGames.xml
new file mode 100644
index 00000000..01204704
--- /dev/null
+++ b/720p/IncludesGames.xml
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+	<include name="DialogGameControllers">
+		<include content="DialogBackgroundCommons">
+			<param name="DialogBackgroundWidth" value="1120" />
+			<param name="DialogBackgroundHeight" value="590" />
+			<param name="DialogHeaderWidth" value="1020" />
+			<param name="DialogHeaderLabel" value="35058" />
+			<param name="DialogHeaderId" value="2" />
+			<param name="CloseButtonLeft" value="1030" />
+			<param name="CloseButtonNav" value="3" />
+		</include>
+		<control type="group" id="9000">
+			<left>20</left>
+			<top>60</top>
+			<control type="label">
+				<description>Controller types heading</description>
+				<top>5</top>
+				<left>30</left>
+				<width>220</width>
+				<height>25</height>
+				<font>font12</font>
+				<label>35050</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>blue</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="scrollbar" id="30">
+				<left>0</left>
+				<top>40</top>
+				<width>25</width>
+				<height>405</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib />
+				<textureslidernibfocus />
+				<onleft>50</onleft>
+				<onright>3</onright>
+				<ondown>3</ondown>
+				<onup>3</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="grouplist" id="3">
+				<description>Controller types grouplist</description>
+				<left>30</left>
+				<top>40</top>
+				<width>220</width>
+				<height>405</height>
+				<onleft>30</onleft>
+				<onright>5</onright>
+				<onup>9001</onup>
+				<ondown>9001</ondown>
+				<pagecontrol>30</pagecontrol>
+			</control>
+			<control type="button" id="10">
+				<description>Default controller types button</description>
+				<height>40</height>
+				<width>220</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<pulseonselect>false</pulseonselect>
+			</control>
+			<control type="gamecontroller" id="31">
+				<left>380</left>
+				<top>90</top>
+				<width>320</width>
+				<height>320</height>
+				<include>VisibleFadeEffect</include>
+			</control>
+			<control type="label">
+				<description>Feature types heading</description>
+				<top>5</top>
+				<left>828</left>
+				<width>220</width>
+				<height>25</height>
+				<font>font12</font>
+				<label>35059</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>blue</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="scrollbar" id="50">
+				<left>1053</left>
+				<top>40</top>
+				<width>25</width>
+				<height>405</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib />
+				<textureslidernibfocus />
+				<onleft>5</onleft>
+				<onright>30</onright>
+				<ondown>5</ondown>
+				<onup>5</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="grouplist" id="5">
+				<description>Feature types grouplist</description>
+				<left>828</left>
+				<top>40</top>
+				<width>220</width>
+				<height>405</height>
+				<onleft>3</onleft>
+				<onright>50</onright>
+				<onup>9001</onup>
+				<ondown>9001</ondown>
+				<pagecontrol>50</pagecontrol>
+			</control>
+			<control type="button" id="7">
+				<description>Default feature types button</description>
+				<height>40</height>
+				<width>220</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<pulseonselect>false</pulseonselect>
+			</control>
+			<control type="label" id="8">
+				<description>Default feature types label</description>
+				<height>40</height>
+				<width>220</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>grey</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+		</control>
+		<control type="grouplist" id="9001">
+			<top>525</top>
+			<width>1120</width>
+			<onup>9000</onup>
+			<ondown>9000</ondown>
+			<align>center</align>
+			<orientation>horizontal</orientation>
+			<itemgap>10</itemgap>
+			<control type="button" id="18">
+				<description>Ok Button</description>
+				<width>200</width>
+				<height>40</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus.png</texturefocus>
+				<label>186</label>
+				<font>font12_title</font>
+			</control>
+			<control type="button" id="19">
+				<description>Reset Button</description>
+				<width>200</width>
+				<height>40</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus.png</texturefocus>
+				<label>13007</label>
+				<font>font12_title</font>
+			</control>
+			<control type="button" id="20">
+				<description>Link to install more controllers</description>
+				<height>40</height>
+				<width>200</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<pulseonselect>false</pulseonselect>
+				<label>$LOCALIZE[21452]</label>
+			</control>
+			<control type="button" id="17">
+				<description>Help button</description>
+				<height>40</height>
+				<width>200</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<pulseonselect>false</pulseonselect>
+				<label>$LOCALIZE[10043]</label>
+			</control>
+			<control type="button" id="21">
+				<description>Ignore input button</description>
+				<height>40</height>
+				<width>200</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<pulseonselect>false</pulseonselect>
+				<label>$LOCALIZE[35019]</label>
+			</control>
+			<control type="button" id="22">
+				<description>Get all button</description>
+				<height>40</height>
+				<width>200</width>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12_title</font>
+				<textcolor>white</textcolor>
+				<pulseonselect>false</pulseonselect>
+				<label>$LOCALIZE[35021]</label>
+			</control>
+		</control>
+	</include>
+	<include name="DialogGamePorts">
+		<include content="DialogBackgroundCommons">
+			<param name="DialogBackgroundWidth" value="1120" />
+			<param name="DialogBackgroundHeight" value="582" />
+			<param name="DialogHeaderWidth" value="1020" />
+			<param name="DialogHeaderLabel" value="35058" />
+			<param name="DialogHeaderId" value="2" />
+			<param name="CloseButtonLeft" value="1030" />
+			<param name="CloseButtonNav" value="3" />
+		</include>
+		<control type="group" id="9000">
+			<left>20</left>
+			<control type="button">
+				<description>Close Window button</description>
+				<left>760</left>
+				<top>65</top>
+				<width>64</width>
+				<height>32</height>
+				<label />
+				<font />
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
+			<control type="list" id="3">
+				<top>67</top>
+				<width>820</width>
+				<height>492</height>
+				<onup>6</onup>
+				<ondown>6</ondown>
+				<onleft>7</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<itemlayout height="82" width="820">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>820</width>
+						<height>76</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="image">
+						<left>2</left>
+						<top>3</top>
+						<width>70</width>
+						<height>70</height>
+						<texture>$INFO[ListItem.Icon]</texture>
+						<aspectratio>keep</aspectratio>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
+						<bordersize>2</bordersize>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>12</top>
+						<width>710</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[B]$INFO[ListItem.Label][/B]</label>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>44</top>
+						<width>710</width>
+						<height>48</height>
+						<font>font12</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="82" width="820">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>820</width>
+						<height>76</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(3)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>820</width>
+						<height>76</height>
+						<texture border="5">button-focus2.png</texture>
+						<visible>Control.HasFocus(3)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>2</left>
+						<top>3</top>
+						<width>70</width>
+						<height>70</height>
+						<texture>$INFO[ListItem.Icon]</texture>
+						<aspectratio>keep</aspectratio>
+						<bordertexture infill="false" border="3">black-back2.png</bordertexture>
+						<bordersize>2</bordersize>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>12</top>
+						<width>710</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[B]$INFO[ListItem.Label][/B]</label>
+					</control>
+					<control type="label">
+						<left>90</left>
+						<top>44</top>
+						<width>710</width>
+						<height>48</height>
+						<font>font12</font>
+						<textcolor>grey</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+				</focusedlayout>
+			</control>
+			<control type="scrollbar" id="61">
+				<left>820</left>
+				<top>65</top>
+				<width>25</width>
+				<height>496</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft>3</onleft>
+				<onright>90</onright>
+				<ondown>61</ondown>
+				<onup>61</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="group">
+				<left>250</left>
+				<control type="label">
+					<description>number of files/pages in list text label</description>
+					<left>592</left>
+					<top>522</top>
+					<width>240</width>
+					<height>35</height>
+					<font>font12</font>
+					<align>center</align>
+					<aligny>center</aligny>
+					<textcolor>grey</textcolor>
+					<label>$VAR[SelectLabel]</label>
+				</control>
+				<control type="grouplist" id="90">
+					<left>612</left>
+					<top>100</top>
+					<onleft>3</onleft>
+					<onright>3</onright>
+					<control type="button" id="18">
+						<description>OK button</description>
+						<width>200</width>
+						<height>40</height>
+						<label>$LOCALIZE[186]</label>
+						<font>font12_title</font>
+						<textcolor>white</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<align>center</align>
+					</control>
+					<control type="button" id="19">
+						<description>Cancel button</description>
+						<width>200</width>
+						<height>40</height>
+						<label>$LOCALIZE[13007]</label>
+						<font>font12_title</font>
+						<textcolor>white</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<align>center</align>
+					</control>
+				</control>
+			</control>
+		</control>
+	</include>
+</includes>
diff --git a/720p/IncludesHomeRecentlyAdded.xml b/720p/IncludesHomeRecentlyAdded.xml
index f2f22db2..550a2a57 100644
--- a/720p/IncludesHomeRecentlyAdded.xml
+++ b/720p/IncludesHomeRecentlyAdded.xml
@@ -63,7 +63,7 @@
 							<height>170</height>
 							<texture fallback="DefaultVideoCover.png" background="true">$INFO[ListItem.Art(poster)]</texture>
 							<aspectratio>keep</aspectratio>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 						</control>
 						<control type="label">
@@ -96,7 +96,7 @@
 							<height>170</height>
 							<texture fallback="DefaultVideoCover.png" background="true">$INFO[ListItem.Art(poster)]</texture>
 							<aspectratio>keep</aspectratio>
-							<bordertexture border="5">folder-focus.png</bordertexture>
+							<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<visible>Control.HasFocus(8000)</visible>
 						</control>
@@ -107,7 +107,7 @@
 							<height>170</height>
 							<texture fallback="DefaultVideoCover.png">$INFO[ListItem.Art(poster)]</texture>
 							<aspectratio>keep</aspectratio>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<visible>!Control.HasFocus(8000)</visible>
 						</control>
@@ -217,8 +217,8 @@
 							<width>220</width>
 							<height>155</height>
 							<aspectratio>scale</aspectratio>
-							<texture background="true">$VAR[PosterThumb]</texture>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+              <texture background="true">$VAR[PosterThumb]</texture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 						</control>
 						<control type="label">
@@ -263,8 +263,8 @@
 							<width>220</width>
 							<height>155</height>
 							<aspectratio>scale</aspectratio>
-							<texture background="true">$VAR[PosterThumb]</texture>
-							<bordertexture border="5">folder-focus.png</bordertexture>
+              <texture background="true">$VAR[PosterThumb]</texture>
+							<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<visible>Control.HasFocus(8001)</visible>
 						</control>
@@ -274,8 +274,8 @@
 							<width>220</width>
 							<height>155</height>
 							<aspectratio>scale</aspectratio>
-							<texture>$VAR[PosterThumb]</texture>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+              <texture>$VAR[PosterThumb]</texture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<visible>!Control.HasFocus(8001)</visible>
 						</control>
@@ -399,8 +399,8 @@
 							<width>180</width>
 							<height>155</height>
 							<aspectratio>keep</aspectratio>
-							<texture background="true">$INFO[ListItem.Art(thumb)]</texture>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<texture fallback="DefaultAlbumCover.png" background="true">$INFO[ListItem.Art(thumb)]</texture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 						</control>
 						<control type="label">
@@ -445,8 +445,8 @@
 							<width>180</width>
 							<height>155</height>
 							<aspectratio>keep</aspectratio>
-							<texture background="true">$INFO[ListItem.Art(thumb)]</texture>
-							<bordertexture border="5">folder-focus.png</bordertexture>
+							<texture fallback="DefaultAlbumCover.png" background="true">$INFO[ListItem.Art(thumb)]</texture>
+							<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<visible>Control.HasFocus(8002)</visible>
 						</control>
@@ -456,8 +456,8 @@
 							<width>180</width>
 							<height>155</height>
 							<aspectratio>keep</aspectratio>
-							<texture background="true">$INFO[ListItem.Art(thumb)]</texture>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<texture fallback="DefaultAlbumCover.png" background="true">$INFO[ListItem.Art(thumb)]</texture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<visible>!Control.HasFocus(8002)</visible>
 						</control>
diff --git a/720p/MusicVisualisation.xml b/720p/MusicVisualisation.xml
index afdcfe12..2d36b3aa 100644
--- a/720p/MusicVisualisation.xml
+++ b/720p/MusicVisualisation.xml
@@ -93,7 +93,7 @@
 				<height>230</height>
 				<texture fallback="DefaultAlbumCover.png">$INFO[Player.Art(thumb)]</texture>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="8">ThumbShadow.png</bordertexture>
+				<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 				<bordersize>8</bordersize>
 			</control>
 			<control type="group">
diff --git a/720p/MyPVRChannels.xml b/720p/MyPVRChannels.xml
index 742c2890..5d2fbec2 100644
--- a/720p/MyPVRChannels.xml
+++ b/720p/MyPVRChannels.xml
@@ -71,7 +71,7 @@
 				<texturefocus border="3">VideoWindowFO.png</texturefocus>
 				<texturenofocus/>
 				<font/>
-				<pulseonselect>no</pulseonselect>
+				<pulseonselect>false</pulseonselect>
 				<onleft>70</onleft>
 				<onclick>Fullscreen</onclick>
 				<visible>Player.HasVideo</visible>
diff --git a/720p/SettingsProfile.xml b/720p/SettingsProfile.xml
index bbb2ced0..4e78707c 100644
--- a/720p/SettingsProfile.xml
+++ b/720p/SettingsProfile.xml
@@ -136,7 +136,7 @@
 					<width>240</width>
 					<height>200</height>
 					<aspectratio>keep</aspectratio>
-					<bordertexture border="12">ThumbBorder.png</bordertexture>
+					<bordertexture infill="false" border="12">ThumbBorder.png</bordertexture>
 					<bordersize>10</bordersize>
 					<texture fallback="DefaultUser.png">$INFO[Container(2).Listitem.Icon]</texture>
 				</control>
@@ -311,7 +311,7 @@
 							<top>0</top>
 							<width>188</width>
 							<height>145</height>
-							<bordertexture border="5">button-nofocus.png</bordertexture>
+							<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<texture fallback="DefaultUser.png">$INFO[Listitem.Icon]</texture>
 							<aspectratio>keep</aspectratio>
@@ -335,7 +335,7 @@
 							<top>0</top>
 							<width>188</width>
 							<height>145</height>
-							<bordertexture border="5">folder-focus.png</bordertexture>
+							<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 							<bordersize>5</bordersize>
 							<texture fallback="DefaultUser.png">$INFO[Listitem.Icon]</texture>
 							<aspectratio>keep</aspectratio>
diff --git a/720p/SettingsScreenCalibration.xml b/720p/SettingsScreenCalibration.xml
index 9940c2e3..e0cdf05b 100644
--- a/720p/SettingsScreenCalibration.xml
+++ b/720p/SettingsScreenCalibration.xml
@@ -135,7 +135,7 @@
 				<width>100%</width>
 				<label></label>
 				<align>center</align>
-				<font>font25</font>
+				<font>font13</font>
 			</control>
 		</control>
 	</controls>
diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
index a44f3d11..fe2dddb0 100644
--- a/720p/SkinSettings.xml
+++ b/720p/SkinSettings.xml
@@ -281,6 +281,18 @@
 						<onclick>Skin.SelectBool(31962, 31963|show_profilename, 31964|show_profileavatar, 16018|show_none)</onclick>
 						<label2>$VAR[ProfileIdentificationLabel2Var]</label2>
 					</control>
+					<control type="button" id="118">
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<label>31021</label>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+						<onclick>Skin.SelectBool(31021, 31030|TitleFormat_nothing, 31036|TitleFormat_only, 31035|TitleFormat_1st, 31034|TitleFormat_2nd)</onclick>
+						<label2>$VAR[ShowOriginalName]</label2>
+					</control>
 				</control>
 				<control type="scrollbar" id="60">
 					<left>1060</left>
@@ -321,6 +333,20 @@
 						<align>left</align>
 						<aligny>center</aligny>
 					</control>
+					<control type="button" id="207">
+						<description>Set Home Default Item Button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>$LOCALIZE[31018]</label>
+						<label2>$INFO[Skin.String(DefaultHomeFocusItem)]</label2>
+						<onclick>SetProperty(SetDefaultHomeItem,1,home)</onclick>
+						<onclick>ActivateWindow(home)</onclick>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>
 					<control type="radiobutton" id="202">
 						<description>enable video info</description>
 						<width>750</width>
@@ -444,6 +470,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[3]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoVideosButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoVideosButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -457,6 +485,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[20342] [COLOR=grey3] ($LOCALIZE[20314])[/COLOR]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoMovieButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoMovieButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -471,6 +501,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[20343] [COLOR=grey3] ($LOCALIZE[20314])[/COLOR]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoTVShowButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoTVShowButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -485,6 +517,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[2]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoMusicButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoMusicButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -498,6 +532,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[1]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoPicturesButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoPicturesButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -511,6 +547,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[24001]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoProgramsButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoProgramsButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -524,6 +562,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[8]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoWeatherButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoWeatherButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -537,10 +577,42 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[15016]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoGamesButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoGamesButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
 					</control>
+					<control type="radiobutton" id="2291">
+						<description>Hide Radio Button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>$LOCALIZE[31111] - $LOCALIZE[19021]</label>
+						<onclick>Skin.ToggleSetting(HomeMenuNoRadioButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
+						<selected>Skin.HasSetting(HomeMenuNoRadioButton)</selected>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>
+					<control type="radiobutton" id="2292">
+						<description>Hide TV Button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>$LOCALIZE[31111] - $LOCALIZE[36037]</label>
+						<onclick>Skin.ToggleSetting(HomeMenuNoTVButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
+						<selected>Skin.HasSetting(HomeMenuNoTVButton)</selected>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>
 					<control type="radiobutton" id="240">
 						<description>Hide Settings Button</description>
 						<width>750</width>
@@ -550,6 +622,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[31114]</label>
 						<onclick>Skin.ToggleSetting(HomeMenuNoSystemButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(HomeMenuNoSystemButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -665,6 +739,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[3]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoVideosButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoVideosButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -678,6 +754,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[20342] [COLOR=grey3] ($LOCALIZE[20314])[/COLOR]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoMovieButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoMovieButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -692,6 +770,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[20343] [COLOR=grey3] ($LOCALIZE[20314])[/COLOR]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoTVShowButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoTVShowButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -706,6 +786,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[2]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoMusicButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoMusicButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -719,6 +801,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[1]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoPicturesButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoPicturesButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -732,6 +816,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[24001]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoProgramsButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoProgramsButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -745,6 +831,8 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[8]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoWeatherButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoWeatherButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
@@ -758,10 +846,42 @@
 						<focusedcolor>white</focusedcolor>
 						<label>$LOCALIZE[31111] - $LOCALIZE[15016]</label>
 						<onclick>Skin.ToggleSetting(MasterHomeMenuNoGamesButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
 						<selected>Skin.HasSetting(MasterHomeMenuNoGamesButton)</selected>
 						<texturefocus>MenuItemFO.png</texturefocus>
 						<texturenofocus>MenuItemNF.png</texturenofocus>
 					</control>
+					<control type="radiobutton" id="2391">
+						<description>Hide Radio Button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>$LOCALIZE[31111] - $LOCALIZE[19021]</label>
+						<onclick>Skin.ToggleSetting(MasterHomeMenuNoRadioButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
+						<selected>Skin.HasSetting(MasterHomeMenuNoRadioButton)</selected>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>
+					<control type="radiobutton" id="2392">
+						<description>Hide TV Button</description>
+						<width>750</width>
+						<height>40</height>
+						<font>font13</font>
+						<textcolor>grey2</textcolor>
+						<focusedcolor>white</focusedcolor>
+						<label>$LOCALIZE[31111] - $LOCALIZE[36037]</label>
+						<onclick>Skin.ToggleSetting(MasterHomeMenuNoTVButton)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocus)</onclick>
+						<onclick>Skin.Reset(DefaultHomeFocusItem)</onclick>
+						<selected>Skin.HasSetting(MasterHomeMenuNoTVButton)</selected>
+						<texturefocus>MenuItemFO.png</texturefocus>
+						<texturenofocus>MenuItemNF.png</texturenofocus>
+					</control>
 				</control>
 				<control type="scrollbar" id="60">
 					<left>1060</left>
diff --git a/720p/SlideShow.xml b/720p/SlideShow.xml
index 24aca04b..8a139c1c 100644
--- a/720p/SlideShow.xml
+++ b/720p/SlideShow.xml
@@ -12,8 +12,6 @@
 				<width>120</width>
 				<height>35</height>
 				<texture>black-back.png</texture>
-				<bordertexture border="3">NoCover_1.png</bordertexture>
-				<bordersize>5</bordersize>
 			</control>
 			<control type="label">
 				<description>paused label</description>
diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
index 6a4b8ad0..7bb9dc9d 100644
--- a/720p/VideoFullScreen.xml
+++ b/720p/VideoFullScreen.xml
@@ -121,7 +121,7 @@
 				<height>230</height>
 				<texture fallback="DefaultVideoCover.png">$VAR[NowPlayingThumb]</texture>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="8">ThumbShadow.png</bordertexture>
+				<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 				<bordersize>8</bordersize>
 				<visible>![VideoPlayer.Content(Movies) | VideoPlayer.Content(LiveTV)]</visible>
 			</control>
@@ -134,7 +134,7 @@
 				<height>330</height>
 				<texture fallback="DefaultVideoCover.png">$VAR[NowPlayingThumb]</texture>
 				<aspectratio aligny="bottom">keep</aspectratio>
-				<bordertexture border="8">ThumbShadow.png</bordertexture>
+				<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 				<bordersize>8</bordersize>
 				<visible>VideoPlayer.Content(Movies)</visible>
 			</control>
@@ -266,6 +266,14 @@
 						<texture>$INFO[VideoPlayer.VideoResolution,flagging/video/,.png]</texture>
 						<visible>!Player.ChannelPreviewActive</visible>
 					</control>
+					<control type="image" id="1">
+						<description>Codec Image</description>
+						<width>73</width>
+						<height>35</height>
+						<aspectratio align="left">keep</aspectratio>
+						<texture>$INFO[VideoPlayer.HdrType,flagging/video/,.png]</texture>
+						<visible>!String.IsEmpty(VideoPlayer.HdrType)</visible>
+					</control>
 					<control type="image" id="1">
 						<description>Audio Codec Image</description>
 						<width>85</width>
@@ -469,8 +477,39 @@
 					<height>16</height>
 					<info>Player.Chapters</info>
 					<texturebg border="6,0,6,0" colordiffuse="00FFFFFF">OSDProgressBack.png</texturebg>
-					<righttexture border="2,4,2,4">OSDProgressNib.png</righttexture>
-					<visible>true</visible>
+					<righttexture border="2,4,2,4" colordiffuse="FFFFFFFF">OSDProgressNib.png</righttexture>
+				</control>
+				<control type="ranges" id="1">
+					<description>Cuts</description>
+					<left>100</left>
+					<top>15</top>
+					<width>720</width>
+					<height>16</height>
+					<info>Player.Cuts</info>
+					<texturebg border="6,0,6,0" colordiffuse="00FFFFFF">OSDProgressBack.png</texturebg>
+					<righttexture border="2,4,2,4" colordiffuse="FFFF0000">OSDProgressNib.png</righttexture>
+				</control>
+				<control type="ranges" id="1">
+					<description>Scene Markers</description>
+					<left>100</left>
+					<top>15</top>
+					<width>720</width>
+					<height>16</height>
+					<info>Player.SceneMarkers</info>
+					<texturebg border="6,0,6,0" colordiffuse="00FFFFFF">OSDProgressBack.png</texturebg>
+					<righttexture border="2,4,2,4" colordiffuse="FF0000FF">OSDProgressNib.png</righttexture>
+				</control>
+				<control type="ranges" id="1">
+					<description>Editlist</description>
+					<left>100</left>
+					<top>15</top>
+					<width>720</width>
+					<height>16</height>
+					<info>Player.Editlist</info>
+					<texturebg border="6,0,6,0" colordiffuse="00FFFFFF">OSDProgressBack.png</texturebg>
+					<lefttexture border="2,4,2,4" colordiffuse="FFFFFFFF">OSDProgressNib.png</lefttexture>
+					<midtexture colordiffuse="FFFF0000">colors/white.png</midtexture>
+					<righttexture border="2,4,2,4" colordiffuse="FFFFFFFF">OSDProgressNib.png</righttexture>
 				</control>
 			</control>
 		</control>
diff --git a/720p/ViewsAddonBrowser.xml b/720p/ViewsAddonBrowser.xml
index 7ae52bd3..1ff6344c 100644
--- a/720p/ViewsAddonBrowser.xml
+++ b/720p/ViewsAddonBrowser.xml
@@ -145,7 +145,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>200</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="group">
@@ -245,7 +245,7 @@
 						<top>0</top>
 						<width>191</width>
 						<height>160</height>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<fadetime>100</fadetime>
 						<texture background="true">$INFO[Listitem.Icon]</texture>
@@ -256,7 +256,7 @@
 						<top>0</top>
 						<width>191</width>
 						<height>160</height>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<fadetime>100</fadetime>
 						<colordiffuse>ff333333</colordiffuse>
@@ -298,7 +298,7 @@
 						<top>0</top>
 						<width>191</width>
 						<height>160</height>
-						<bordertexture border="5">folder-focus.png</bordertexture>
+						<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<fadetime>100</fadetime>
 						<texture background="true">$INFO[Listitem.Icon]</texture>
@@ -309,7 +309,7 @@
 						<top>0</top>
 						<width>191</width>
 						<height>160</height>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<fadetime>100</fadetime>
 						<colordiffuse>ff333333</colordiffuse>
diff --git a/720p/ViewsFileMode.xml b/720p/ViewsFileMode.xml
index f4aa802c..f6092267 100644
--- a/720p/ViewsFileMode.xml
+++ b/720p/ViewsFileMode.xml
@@ -34,7 +34,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>280</left>
@@ -127,7 +127,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>280</left>
@@ -213,7 +213,7 @@
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="image">
@@ -251,7 +251,7 @@
 						<top>0</top>
 						<width>214</width>
 						<height>160</height>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 						<aspectratio>keep</aspectratio>
@@ -263,7 +263,7 @@
 						<width>214</width>
 						<height>160</height>
 						<aspectratio>scale</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$INFO[Listitem.Icon]</texture>
 						<visible>Container.Content(Episodes)</visible>
@@ -278,7 +278,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>center</align>
 						<aligny>center</aligny>
-						<info>ListItem.Label</info>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="image">
 						<left>170</left>
@@ -295,7 +295,7 @@
 						<top>0</top>
 						<width>214</width>
 						<height>160</height>
-						<bordertexture border="5">folder-focus.png</bordertexture>
+						<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 						<aspectratio>keep</aspectratio>
@@ -307,7 +307,7 @@
 						<width>214</width>
 						<height>160</height>
 						<aspectratio>scale</aspectratio>
-						<bordertexture border="5">folder-focus.png</bordertexture>
+						<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$INFO[Listitem.Icon]</texture>
 						<visible>Container.Content(Episodes)</visible>
@@ -322,7 +322,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>center</align>
 						<aligny>center</aligny>
-						<info>ListItem.Label</info>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="image">
 						<left>170</left>
@@ -339,7 +339,7 @@
 						<top>0</top>
 						<width>214</width>
 						<height>240</height>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 						<aspectratio>keep</aspectratio>
@@ -354,7 +354,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>center</align>
 						<aligny>center</aligny>
-						<info>ListItem.Label</info>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="image">
 						<left>170</left>
@@ -371,7 +371,7 @@
 						<top>0</top>
 						<width>214</width>
 						<height>240</height>
-						<bordertexture border="5">folder-focus.png</bordertexture>
+						<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 						<aspectratio>keep</aspectratio>
@@ -386,7 +386,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>center</align>
 						<aligny>center</aligny>
-						<info>ListItem.Label</info>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="image">
 						<left>170</left>
@@ -440,7 +440,7 @@
 						<top>0</top>
 						<width>538</width>
 						<height>105</height>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$VAR[BannerThumb]</texture>
 						<aspectratio>keep</aspectratio>
@@ -460,7 +460,7 @@
 						<top>0</top>
 						<width>538</width>
 						<height>105</height>
-						<bordertexture border="5">folder-focus.png</bordertexture>
+						<bordertexture infill="false" border="5">folder-focus.png</bordertexture>
 						<bordersize>5</bordersize>
 						<texture background="true">$VAR[BannerThumb]</texture>
 						<aspectratio>keep</aspectratio>
@@ -535,7 +535,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>60</left>
@@ -636,7 +636,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>60</left>
diff --git a/720p/ViewsLiveTV.xml b/720p/ViewsLiveTV.xml
index 9785f4f5..d88325b1 100644
--- a/720p/ViewsLiveTV.xml
+++ b/720p/ViewsLiveTV.xml
@@ -131,7 +131,7 @@
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="fadelabel">
diff --git a/720p/ViewsMusicLibrary.xml b/720p/ViewsMusicLibrary.xml
index 70c05083..f43be469 100644
--- a/720p/ViewsMusicLibrary.xml
+++ b/720p/ViewsMusicLibrary.xml
@@ -160,7 +160,7 @@
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture fallback="DefaultAlbumCover.png" background="true">$VAR[MusicInfoListViewThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="image">
@@ -245,7 +245,7 @@
 						<width>160</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true">$INFO[ListItem.Icon]</texture>
@@ -265,7 +265,7 @@
 						<width>160</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$INFO[ListItem.Icon]</texture>
@@ -279,7 +279,7 @@
 						<width>168</width>
 						<height>168</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="8">ThumbBorder.png</bordertexture>
+						<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 						<bordersize>8</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true">$INFO[ListItem.Icon]</texture>
@@ -588,7 +588,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="grouplist">
@@ -770,7 +770,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="group">
@@ -1004,7 +1004,7 @@
 					<aspectratio aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="label">
diff --git a/720p/ViewsPictures.xml b/720p/ViewsPictures.xml
index bdf5a0e5..01726c9f 100644
--- a/720p/ViewsPictures.xml
+++ b/720p/ViewsPictures.xml
@@ -29,7 +29,7 @@
 						<width>160</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="10">ThumbShadow.png</bordertexture>
+						<bordertexture infill="false" border="10">ThumbShadow.png</bordertexture>
 						<bordersize>8</bordersize>
 						<fadetime>200</fadetime>
 						<texture border="2">ThumbBG.png</texture>
@@ -51,7 +51,7 @@
 						<width>160</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="10">ThumbShadow.png</bordertexture>
+						<bordertexture infill="false" border="10">ThumbShadow.png</bordertexture>
 						<bordersize>8</bordersize>
 						<fadetime>200</fadetime>
 						<texture border="2">ThumbBG.png</texture>
@@ -112,7 +112,7 @@
 						<width>144</width>
 						<height>144</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="10">ThumbShadow.png</bordertexture>
+						<bordertexture infill="false" border="10">ThumbShadow.png</bordertexture>
 						<bordersize>8</bordersize>
 						<fadetime>200</fadetime>
 						<texture border="2">ThumbBG.png</texture>
@@ -133,7 +133,7 @@
 						<width>144</width>
 						<height>144</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="10">folder-Focus.png</bordertexture>
+						<bordertexture infill="false" border="10">folder-Focus.png</bordertexture>
 						<bordersize>8</bordersize>
 						<fadetime>200</fadetime>
 						<texture border="2">ThumbBG.png</texture>
@@ -188,7 +188,7 @@
 					<texture background="true">$INFO[ListItem.FilenameAndPath]</texture>
 					<fadetime>600</fadetime>
 					<aspectratio>keep</aspectratio>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>9</bordersize>
 				</control>
 				<control type="label">
diff --git a/720p/ViewsVideoLibrary.xml b/720p/ViewsVideoLibrary.xml
index 54374361..2393de8f 100644
--- a/720p/ViewsVideoLibrary.xml
+++ b/720p/ViewsVideoLibrary.xml
@@ -35,7 +35,7 @@
 						<width>214</width>
 						<height>310</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 					</control>
@@ -48,7 +48,7 @@
 						<width>222</width>
 						<height>318</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="8">ThumbBorder.png</bordertexture>
+						<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 						<bordersize>8</bordersize>
 						<texture background="true">$VAR[PosterThumb]</texture>
 						<animation reversible="false" effect="zoom" start="-2,36,222,318" end="-28,0,284,390" time="150">focus</animation>
@@ -131,7 +131,7 @@
 				<scroll>true</scroll>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ShowCustomLabel]</label>
 			</control>
 			<control type="label">
 				<left>0</left>
@@ -199,7 +199,7 @@
 				<scroll>true</scroll>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ShowCustomLabel]</label>
 			</control>
 			<control type="label">
 				<left>0</left>
@@ -250,7 +250,7 @@
 				<scroll>true</scroll>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ShowCustomLabel]</label>
 			</control>
 			<control type="label">
 				<left>0</left>
@@ -314,7 +314,7 @@
 				<scroll>true</scroll>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ShowCustomLabel]</label>
 				<animation effect="slide" start="0,0" end="0,25" time="150" condition="!Control.HasFocus(508)">conditional</animation>
 			</control>
 		</control>
@@ -349,7 +349,7 @@
 						<width>120</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true">$VAR[PosterThumb]</texture>
@@ -369,7 +369,7 @@
 						<width>120</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$VAR[PosterThumb]</texture>
@@ -383,7 +383,7 @@
 						<width>128</width>
 						<height>168</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="8">ThumbBorder.png</bordertexture>
+						<bordertexture infill="false" border="8">ThumbBorder.png</bordertexture>
 						<bordersize>8</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true">$VAR[PosterThumb]</texture>
@@ -397,7 +397,7 @@
 						<width>120</width>
 						<height>160</height>
 						<aspectratio>stretch</aspectratio>
-						<bordertexture border="5" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
+						<bordertexture infill="false" border="5" diffuse="diffuse_mirror2.png">button-nofocus.png</bordertexture>
 						<bordersize>4</bordersize>
 						<fadetime>200</fadetime>
 						<texture background="true" flipy="true" diffuse="diffuse_mirror2.png">$VAR[PosterThumb]</texture>
@@ -462,7 +462,7 @@
 				<scroll>true</scroll>
 				<align>center</align>
 				<aligny>center</aligny>
-				<label>$INFO[ListItem.Label]</label>
+				<label>$VAR[ShowCustomLabel]</label>
 			</control>
 			<control type="group">
 				<left>40</left>
@@ -810,7 +810,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>10</left>
@@ -889,7 +889,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>10</left>
@@ -960,7 +960,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[BannerThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="label">
@@ -1068,7 +1068,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="grouplist">
@@ -1132,7 +1132,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="textbox">
@@ -1174,7 +1174,7 @@
 					<aspectratio>keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="grouplist">
@@ -1242,7 +1242,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>10</left>
@@ -1321,7 +1321,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="label">
 						<left>10</left>
@@ -1393,7 +1393,7 @@
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true" fallback="Fanart_Fallback_Small.jpg">$INFO[ListItem.Art(fanart)]</texture>
 					<visible>Container.Content(Movies)</visible>
-					<bordertexture background="true" border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="image">
@@ -1405,7 +1405,7 @@
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true" fallback="Fanart_Fallback_Small.jpg">$INFO[ListItem.Art(fanart)]</texture>
 					<visible>Container.Content(TVShows) | Container.Content(Videos)</visible>
-					<bordertexture background="true" border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="grouplist">
@@ -1538,7 +1538,7 @@
 					<aspectratio>scale</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture background="true" border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 				<control type="grouplist">
@@ -1696,7 +1696,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="image">
 						<left>320</left>
@@ -1744,7 +1744,7 @@
 						<selectedcolor>selected</selectedcolor>
 						<align>left</align>
 						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
+						<label>$VAR[ShowCustomLabel]</label>
 					</control>
 					<control type="image">
 						<left>320</left>
@@ -1803,7 +1803,7 @@
 					<shadowcolor>black</shadowcolor>
 					<align>left</align>
 					<aligny>center</aligny>
-					<label>$INFO[ListItem.Label]</label>
+					<label>$VAR[ShowCustomLabel]</label>
 				</control>
 				<control type="textbox">
 					<description>Description Value for Video</description>
@@ -1841,7 +1841,7 @@
 					<aspectratio align="left" aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 			</control>
@@ -1868,7 +1868,7 @@
 					<shadowcolor>black</shadowcolor>
 					<align>left</align>
 					<aligny>center</aligny>
-					<label>$INFO[ListItem.Label]</label>
+					<label>$VAR[ShowCustomLabel]</label>
 				</control>
 				<control type="textbox">
 					<description>Description Value for Video</description>
@@ -1891,7 +1891,7 @@
 					<aspectratio align="left" aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 			</control>
@@ -1918,7 +1918,7 @@
 					<shadowcolor>black</shadowcolor>
 					<align>left</align>
 					<aligny>center</aligny>
-					<label>$INFO[ListItem.Label]</label>
+					<label>$VAR[ShowCustomLabel]</label>
 				</control>
 				<control type="textbox">
 					<description>Description Value for Video</description>
@@ -1941,7 +1941,7 @@
 					<aspectratio align="left" aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$VAR[PosterThumb]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 			</control>
@@ -1968,7 +1968,7 @@
 					<shadowcolor>black</shadowcolor>
 					<align>left</align>
 					<aligny>center</aligny>
-					<label>$INFO[ListItem.Label]</label>
+					<label>$VAR[ShowCustomLabel]</label>
 				</control>
 				<control type="textbox">
 					<description>Description Value for Video</description>
@@ -2006,7 +2006,7 @@
 					<aspectratio align="left" aligny="bottom">keep</aspectratio>
 					<fadetime>IconCrossfadeTime</fadetime>
 					<texture background="true">$INFO[ListItem.Icon]</texture>
-					<bordertexture border="8">ThumbShadow.png</bordertexture>
+					<bordertexture infill="false" border="8">ThumbShadow.png</bordertexture>
 					<bordersize>8</bordersize>
 				</control>
 			</control>
diff --git a/720p/ViewsWeather.xml b/720p/ViewsWeather.xml
index 82bf9614..4f07f9e8 100644
--- a/720p/ViewsWeather.xml
+++ b/720p/ViewsWeather.xml
@@ -997,10 +997,6 @@
 					</control>
 				</focusedlayout>
 				<content>
-					<item>
-						<icon>$LOCALIZE[31909]</icon>
-						<visible>String.IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
 					<include content="WeatherHourlyItem">
 						<param name="item_id" value="1" />
 					</include>
diff --git a/addon.xml b/addon.xml
index 47c94cd8..ea72c6cc 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.confluence" version="4.7.15" name="Confluence" provider-name="Jezz_X, Team Kodi">
+<addon id="skin.confluence" version="4.8.0" name="Confluence" provider-name="Jezz_X, Team Kodi">
 	<requires>
-		<import addon="xbmc.gui" version="5.15.0"/>
+		<import addon="xbmc.gui" version="5.16.0"/>
 	</requires>
 	<extension point="xbmc.gui.skin" debugging="false" effectslowdown="1.0">
 		<res width="1280" height="720" aspect="16:9" default="true" folder="720p" />
@@ -24,7 +24,7 @@
 			<screenshot>resources/screenshot-08.jpg</screenshot>
 			<screenshot>resources/screenshot-09.jpg</screenshot>
 		</assets>
-		<news>- Add OSD dialog to control tempo for fullscreen video window.</news>
+		<news>Nexus update.</news>
 		<summary lang="af_ZA">Confluence oortreksel deur Jezz_X.</summary>
 		<summary lang="ar_SA">جلد كونفليونس من صنع Jezz_x. (الجلد المبدأى لبرنامج إكس بى إم سى)</summary>
 		<summary lang="be_BY">Абалонка Confluence ад Jezz_X.</summary>
@@ -145,4 +145,4 @@
 		<description lang="zh_CN">Confluence 集合了许多流行皮肤的创意，力求把这些优点融合到一个皮肤中，使得首次使用 Kodi 的用户能更容易上手。</description>
 		<description lang="zh_TW">Confluence 是從 Kodi 9.11 開始預設的面板。它結合了許多受歡迎面板的概念，且試圖包含並整合它們的優點，使第一次使用 Kodi 的使用者可以簡單地上手。</description>
 	</extension>
-</addon>
\ No newline at end of file
+</addon>
diff --git a/changelog.txt b/changelog.txt
index cf744883..c94ebbf2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,19 @@
+[B]4.8.00[/B]
+
+- Bump skin version and update changelog
+- Add movie title format option
+- Bump xbmc.gui for Nexus
+- Add Nexus game changes
+- Add show password button to keyboard
+- Add Player.Process(videoscantype) infolabel
+- Add Cuts, Scene Markers, and Editlist
+- Add missing aspect ratios
+- Add 'infill' attribute to border textures
+- Add HDR flagging
+- Delete DialogFavourites.xml
+- Fix home episode thumbs not using spoiler settings
+- Add default start item selection
+
 [B]4.7.15[/B]
 
 - Fix image in select dialog
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 4fba7e66..f4943297 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -96,7 +96,21 @@ msgctxt "#31017"
 msgid "Unavailable"
 msgstr ""
 
-#empty strings from id 31018 to 31021
+msgctxt "#31018"
+msgid "Set default startup item"
+msgstr ""
+
+msgctxt "#31019"
+msgid "Press 'Up' to set this item as default"
+msgstr ""
+
+msgctxt "#31020"
+msgid "Game saves"
+msgstr ""
+
+msgctxt "#31021"
+msgid "Movie title format"
+msgstr ""
 
 msgctxt "#31022"
 msgid "Play speed"
@@ -130,7 +144,9 @@ msgctxt "#31029"
 msgid "Fanart"
 msgstr ""
 
-#empty string with id 31030
+msgctxt "#31030"
+msgid "No changes"
+msgstr ""
 
 msgctxt "#31031"
 msgid "Pic thumbs"
@@ -144,7 +160,25 @@ msgctxt "#31033"
 msgid "Info"
 msgstr ""
 
-#empty strings from id 31034 to 31038
+msgctxt "#31034"
+msgid "Original title (Localised title)"
+msgstr ""
+
+msgctxt "#31035"
+msgid "Localised title (Original title)"
+msgstr ""
+
+msgctxt "#31036"
+msgid "Just Original title"
+msgstr ""
+
+msgctxt "#31037"
+msgid "Select + X"
+msgstr ""
+
+msgctxt "#31038"
+msgid "Select + Start"
+msgstr ""
 
 msgctxt "#31039"
 msgid "Actions"
@@ -154,7 +188,9 @@ msgctxt "#31040"
 msgid "Now playing"
 msgstr ""
 
-#empty string with id 31041
+msgctxt "#31041"
+msgid "Select + Right Stick"
+msgstr ""
 
 msgctxt "#31042"
 msgid "PLAYING"
@@ -387,7 +423,7 @@ msgstr ""
 
 msgctxt "#31147"
 msgid "Hide - Favourites"
-msgstr ""\
+msgstr ""
 
 msgctxt "#31148"
 msgid "Hide - Search"
diff --git a/media/HomeBladeSub.png b/media/HomeBladeSub.png
deleted file mode 100644
index 87c8ba54..00000000
Binary files a/media/HomeBladeSub.png and /dev/null differ
diff --git a/media/OSDDSPAudioFO.png b/media/OSDDSPAudioFO.png
deleted file mode 100644
index 67e2cb8a..00000000
Binary files a/media/OSDDSPAudioFO.png and /dev/null differ
diff --git a/media/OSDDSPAudioNF.png b/media/OSDDSPAudioNF.png
deleted file mode 100644
index 606a825b..00000000
Binary files a/media/OSDDSPAudioNF.png and /dev/null differ
diff --git a/media/OSDProgressNib.png b/media/OSDProgressNib.png
index 8d5afff1..a4585ee1 100644
Binary files a/media/OSDProgressNib.png and b/media/OSDProgressNib.png differ
diff --git a/media/button-focus3.png b/media/button-focus3.png
deleted file mode 100644
index 607c1750..00000000
Binary files a/media/button-focus3.png and /dev/null differ
diff --git a/media/flagging/aspectratio/1.00.png b/media/flagging/aspectratio/1.00.png
new file mode 100644
index 00000000..19cd1ce3
Binary files /dev/null and b/media/flagging/aspectratio/1.00.png differ
diff --git a/media/flagging/aspectratio/1.19.png b/media/flagging/aspectratio/1.19.png
new file mode 100644
index 00000000..2965cce1
Binary files /dev/null and b/media/flagging/aspectratio/1.19.png differ
diff --git a/media/flagging/aspectratio/2.00.png b/media/flagging/aspectratio/2.00.png
new file mode 100644
index 00000000..e9c062c4
Binary files /dev/null and b/media/flagging/aspectratio/2.00.png differ
diff --git a/media/flagging/video/dolbyvision.png b/media/flagging/video/dolbyvision.png
new file mode 100644
index 00000000..e281536b
Binary files /dev/null and b/media/flagging/video/dolbyvision.png differ
diff --git a/media/flagging/video/hdr10.png b/media/flagging/video/hdr10.png
new file mode 100644
index 00000000..c718b228
Binary files /dev/null and b/media/flagging/video/hdr10.png differ
diff --git a/media/flagging/video/hlg.png b/media/flagging/video/hlg.png
new file mode 100644
index 00000000..155465c6
Binary files /dev/null and b/media/flagging/video/hlg.png differ
diff --git a/media/password-radiobutton-focus.png b/media/password-radiobutton-focus.png
new file mode 100644
index 00000000..3b730690
Binary files /dev/null and b/media/password-radiobutton-focus.png differ
diff --git a/media/password-radiobutton-nofocus.png b/media/password-radiobutton-nofocus.png
new file mode 100644
index 00000000..31059680
Binary files /dev/null and b/media/password-radiobutton-nofocus.png differ