diff --git a/720p/AddonBrowser.xml b/720p/AddonBrowser.xml
index 032ed5d..2e90021 100644
--- a/720p/AddonBrowser.xml
+++ b/720p/AddonBrowser.xml
@@ -57,7 +57,7 @@
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="3">
 					<description>Sort by button</description>
@@ -68,7 +68,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
diff --git a/720p/Defaults.xml b/720p/Defaults.xml
index e29e80a..a909ad4 100644
--- a/720p/Defaults.xml
+++ b/720p/Defaults.xml
@@ -3,10 +3,10 @@
 	<default type="image">
 		<left>0</left>
 		<top>0</top>
-		<texture>-</texture>
+		<texture></texture>
 	</default>
 	<default type="label">
-		<label>-</label>
+		<label></label>
 		<font>font13</font>
 		<textcolor>white</textcolor>
 		<disabledcolor>grey3</disabledcolor>
@@ -40,7 +40,7 @@
 		<alttexturefocus>scroll-down-focus.png</alttexturefocus>
 		<alttexturenofocus>scroll-down.png</alttexturenofocus>
 		<textcolor>white</textcolor>
-		<label>-</label>
+		<label></label>
 		<font>font13</font>
 		<disabledcolor>grey3</disabledcolor>
 		<pulseonselect>no</pulseonselect>
@@ -58,10 +58,10 @@
 		<left>100</left>
 		<top>325</top>
 		<texturebg border="6,0,6,0">OSDProgressBack.png</texturebg>
-		<lefttexture>-</lefttexture>
+		<lefttexture></lefttexture>
 		<midtexture border="6,0,6,0">OSDProgressMid.png</midtexture>
-		<righttexture>-</righttexture>
-		<overlaytexture>-</overlaytexture>
+		<righttexture></righttexture>
+		<overlaytexture></overlaytexture>
 	</default>
 	<default type="spincontrol">
 		<left>330</left>
@@ -92,7 +92,7 @@
 		<spinwidth>33</spinwidth>
 		<spinheight>22</spinheight>
 		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>-</texturenofocus>
+		<texturenofocus></texturenofocus>
 		<textureup>scroll-up-2.png</textureup>
 		<texturedown>scroll-down-2.png</texturedown>
 		<textureupdisabled colordiffuse="40FFFFFF">scroll-up-2.png</textureupdisabled>
@@ -135,10 +135,10 @@
 		<top>335</top>
 		<width>300</width>
 		<height>50</height>
-		<label>-</label>
+		<label></label>
 		<font>font12</font>
-		<texturefocus>-</texturefocus>
-		<texturenofocus>-</texturenofocus>
+		<texturefocus></texturefocus>
+		<texturenofocus></texturenofocus>
 		<texturebg>button-focus.png</texturebg>
 		<textureleft>scroll-left.png</textureleft>
 		<textureleftfocus>scroll-left-focus.png</textureleftfocus>
diff --git a/720p/DialogAddonSettings.xml b/720p/DialogAddonSettings.xml
index b0dd0aa..75a4ce7 100644
--- a/720p/DialogAddonSettings.xml
+++ b/720p/DialogAddonSettings.xml
@@ -166,7 +166,7 @@
 		<control type="label" id="7">
 			<height>35</height>
 			<font>font13_title</font>
-			<label>-</label>
+			<label></label>
 			<textcolor>blue</textcolor>
 			<shadowcolor>black</shadowcolor>
 			<align>left</align>
diff --git a/720p/DialogAudioDSPManager.xml b/720p/DialogAudioDSPManager.xml
index 631caca..e772cba 100644
--- a/720p/DialogAudioDSPManager.xml
+++ b/720p/DialogAudioDSPManager.xml
@@ -27,8 +27,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogButtonMenu.xml b/720p/DialogButtonMenu.xml
index 7f32e08..d6d3c2a 100644
--- a/720p/DialogButtonMenu.xml
+++ b/720p/DialogButtonMenu.xml
@@ -13,11 +13,11 @@
 			<top>-16</top>
 			<width>4</width>
 			<height>4</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onfocus>down</onfocus>
-			<texturefocus>-</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturefocus></texturefocus>
+			<texturenofocus></texturenofocus>
 			<onleft>9000</onleft>
 			<onright>9000</onright>
 			<onup>9000</onup>
@@ -58,8 +58,8 @@
 					<top>5</top>
 					<width>64</width>
 					<height>32</height>
-					<label>-</label>
-					<font>-</font>
+					<label></label>
+					<font></font>
 					<onclick>PreviousMenu</onclick>
 					<texturefocus>DialogCloseButton-focus.png</texturefocus>
 					<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogConfirm.xml b/720p/DialogConfirm.xml
index 3a07951..a70b438 100644
--- a/720p/DialogConfirm.xml
+++ b/720p/DialogConfirm.xml
@@ -23,7 +23,7 @@
 			<width>590</width>
 			<height>98</height>
 			<align>left</align>
-			<label>-</label>
+			<label></label>
 			<font>font13</font>
 			<autoscroll time="3000" delay="4000" repeat="5000">true</autoscroll>
 		</control>
diff --git a/720p/DialogContextMenu.xml b/720p/DialogContextMenu.xml
index ffc3596..63a2d7b 100644
--- a/720p/DialogContextMenu.xml
+++ b/720p/DialogContextMenu.xml
@@ -29,8 +29,8 @@
 			<top>5</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -42,8 +42,8 @@
 		</control>
 		<control type="button" id="1000">
 			<description>button template</description>
-			<left>-</left>
-			<top>-</top>
+			<left></left>
+			<top></top>
 			<width>300</width>
 			<height>38</height>
 			<font>fontContextMenu</font>
diff --git a/720p/DialogFavourites.xml b/720p/DialogFavourites.xml
index 24e58f1..ef8adca 100644
--- a/720p/DialogFavourites.xml
+++ b/720p/DialogFavourites.xml
@@ -23,8 +23,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -54,7 +54,7 @@
 				<onleft>Dialog.Close(Favourites)</onleft>
 				<onright>450</onright>
 				<ondown>450</ondown>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<scrolltime>200</scrolltime>
 				<itemlayout height="40">
 					<control type="image">
diff --git a/720p/DialogGameControllers.xml b/720p/DialogGameControllers.xml
index b930103..258b231 100644
--- a/720p/DialogGameControllers.xml
+++ b/720p/DialogGameControllers.xml
@@ -40,8 +40,8 @@
 				<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>-</textureslidernib>
-				<textureslidernibfocus>-</textureslidernibfocus>
+				<textureslidernib></textureslidernib>
+				<textureslidernibfocus></textureslidernibfocus>
 				<onleft>50</onleft>
 				<onright>3</onright>
 				<ondown>3</ondown>
@@ -99,8 +99,8 @@
 				<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>-</textureslidernib>
-				<textureslidernibfocus>-</textureslidernibfocus>
+				<textureslidernib></textureslidernib>
+				<textureslidernibfocus></textureslidernibfocus>
 				<onleft>5</onleft>
 				<onright>30</onright>
 				<ondown>5</ondown>
diff --git a/720p/DialogKeyboard.xml b/720p/DialogKeyboard.xml
index 7f215c4..566cfa2 100644
--- a/720p/DialogKeyboard.xml
+++ b/720p/DialogKeyboard.xml
@@ -85,8 +85,8 @@
 				<font>font13</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturefocus>-</texturefocus>
-				<texturenofocus>-</texturenofocus>
+				<texturefocus></texturefocus>
+				<texturenofocus></texturenofocus>
 			</control>
 			<control type="image">
 				<left>130</left>
@@ -535,7 +535,7 @@
 						<texturefocus border="5">KeyboardKey.png</texturefocus>
 						<align>center</align>
 						<aligny>center</aligny>
-						<font>-</font>
+						<font></font>
 						<focusedcolor>black</focusedcolor>
 					</control>
 					<control type="button" id="305">
diff --git a/720p/DialogMediaSource.xml b/720p/DialogMediaSource.xml
index a4fcd37..e8f5618 100644
--- a/720p/DialogMediaSource.xml
+++ b/720p/DialogMediaSource.xml
@@ -182,7 +182,7 @@
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<label>-</label>
+			<label></label>
 			<font>font13</font>
 			<texturefocus border="5">button-focus2.png</texturefocus>
 			<texturenofocus border="5">button-nofocus.png</texturenofocus>
diff --git a/720p/DialogMusicInfo.xml b/720p/DialogMusicInfo.xml
index f8a4571..6edcf48 100644
--- a/720p/DialogMusicInfo.xml
+++ b/720p/DialogMusicInfo.xml
@@ -20,8 +20,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -70,7 +70,7 @@
 						<onright>49</onright>
 						<onup>9000</onup>
 						<ondown>50</ondown>
-						<pagecontrol>-</pagecontrol>
+						<pagecontrol></pagecontrol>
 						<scrolltime>200</scrolltime>
 						<itemlayout height="30">
 							<control type="label">
@@ -199,22 +199,22 @@
 					<control type="button" id="6">
 						<description>Refresh</description>
 						<include>ButtonInfoDialogsCommonValues</include>
-						<label>-</label>
+						<label></label>
 					</control>
 					<control type="button" id="10">
 						<description>Get Thumb</description>
 						<include>ButtonInfoDialogsCommonValues</include>
-						<label>-</label>
+						<label></label>
 					</control>
 					<control type="button" id="12">
 						<description>Get Fanart / Album info</description>
 						<include>ButtonInfoDialogsCommonValues</include>
-						<label>-</label>
+						<label></label>
 					</control>
 					<control type="button" id="7">
 						<description>Set my rating</description>
 						<include>ButtonInfoDialogsCommonValues</include>
-						<label>-</label>
+						<label></label>
 					</control>
 				</control>
 			</control>
diff --git a/720p/DialogNumeric.xml b/720p/DialogNumeric.xml
index e34801c..b7b433f 100644
--- a/720p/DialogNumeric.xml
+++ b/720p/DialogNumeric.xml
@@ -29,8 +29,8 @@
 			<top>15</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -146,7 +146,7 @@
 				<texturenofocus flipx="true" border="5,25,25,5">KeyboardCornerTopNF.png</texturenofocus>
 				<texturefocus flipx="true" border="5,25,25,5">KeyboardCornerTop.png</texturefocus>
 				<textwidth>120</textwidth>
-				<label>-</label>
+				<label></label>
 				<focusedcolor>black</focusedcolor>
 				<onleft>13</onleft>
 				<onright>11</onright>
@@ -281,7 +281,7 @@
 				<texturenofocus flipx="true" border="25,5,5,25">KeyboardCornerBottomNF.png</texturenofocus>
 				<texturefocus flipx="true" border="5,5,25,25">KeyboardCornerBottom.png</texturefocus>
 				<textwidth>120</textwidth>
-				<label>-</label>
+				<label></label>
 				<focusedcolor>black</focusedcolor>
 				<onleft>19</onleft>
 				<onright>17</onright>
diff --git a/720p/DialogPVRChannelsOSD.xml b/720p/DialogPVRChannelsOSD.xml
index ff0939c..9a0838f 100644
--- a/720p/DialogPVRChannelsOSD.xml
+++ b/720p/DialogPVRChannelsOSD.xml
@@ -22,8 +22,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogPVRGroupManager.xml b/720p/DialogPVRGroupManager.xml
index 8a619dd..41bef04 100644
--- a/720p/DialogPVRGroupManager.xml
+++ b/720p/DialogPVRGroupManager.xml
@@ -37,8 +37,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogPVRGuideOSD.xml b/720p/DialogPVRGuideOSD.xml
index 49243ab..656d0bb 100644
--- a/720p/DialogPVRGuideOSD.xml
+++ b/720p/DialogPVRGuideOSD.xml
@@ -22,8 +22,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogPVRGuideSearch.xml b/720p/DialogPVRGuideSearch.xml
index df8ca30..811abc9 100644
--- a/720p/DialogPVRGuideSearch.xml
+++ b/720p/DialogPVRGuideSearch.xml
@@ -46,8 +46,8 @@
 			<font>font13</font>
 			<textcolor>white</textcolor>
 			<shadowcolor>black</shadowcolor>
-			<texturefocus>-</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturefocus></texturefocus>
+			<texturenofocus></texturenofocus>
 			<align>left</align>
 			<onleft>9</onleft>
 			<onright>9</onright>
diff --git a/720p/DialogPVRInfo.xml b/720p/DialogPVRInfo.xml
index 3a4c2b8..294fc6c 100644
--- a/720p/DialogPVRInfo.xml
+++ b/720p/DialogPVRInfo.xml
@@ -25,7 +25,7 @@
 			<onright>49</onright>
 			<onup>9000</onup>
 			<ondown>61</ondown>
-			<pagecontrol>-</pagecontrol>
+			<pagecontrol></pagecontrol>
 			<scrolltime>200</scrolltime>
 			<itemlayout height="30">
 				<control type="label">
@@ -166,12 +166,12 @@
 			<left>720</left>
 			<top>375</top>
 			<subtype>page</subtype>
-			<font>-</font>
+			<font></font>
 			<onleft>60</onleft>
 			<onright>60</onright>
 			<ondown>9000</ondown>
 			<onup>9000</onup>
-			<textcolor>-</textcolor>
+			<textcolor></textcolor>
 			<showonepage>true</showonepage>
 		</control>
 		<control type="textbox" id="400">
@@ -223,7 +223,7 @@
 			<control type="button" id="6">
 				<description>Record</description>
 				<include>ButtonInfoDialogsCommonValues</include>
-				<label>-</label>
+				<label></label>
 				<visible>Window.IsActive(PVRGuideInfo)</visible>
 			</control>
 			<control type="button" id="7">
diff --git a/720p/DialogPVRRadioRDSInfo.xml b/720p/DialogPVRRadioRDSInfo.xml
index ae94cff..85569c7 100644
--- a/720p/DialogPVRRadioRDSInfo.xml
+++ b/720p/DialogPVRRadioRDSInfo.xml
@@ -52,8 +52,8 @@
 			<top>15</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -282,7 +282,7 @@
 				<font>font13</font>
 				<textcolor>white</textcolor>
 				<align>left</align>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<label fallback="161">$INFO[RDS.Artist]</label>
 				<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
 				<visible>String.IsEmpty(RDS.Band) + !String.IsEmpty(RDS.Artist)</visible>
@@ -337,7 +337,7 @@
 				<font>font13</font>
 				<textcolor>white</textcolor>
 				<align>left</align>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<label>$INFO[RDS.Artist]</label>
 				<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
 				<visible>!String.IsEmpty(RDS.Artist) + !String.IsEmpty(RDS.Band)</visible>
@@ -895,7 +895,7 @@
 				<font>font13</font>
 				<textcolor>white</textcolor>
 				<aligny>center</aligny>
-				<label>-</label>
+				<label></label>
 				<textoffsetx>10</textoffsetx>
 				<onright>21</onright>
 				<onleft>21</onleft>
@@ -907,12 +907,12 @@
 				<left>0</left>
 				<top>155</top>
 				<subtype>page</subtype>
-				<font>-</font>
+				<font></font>
 				<onright>9000</onright>
 				<onleft>9000</onleft>
 				<ondown>21</ondown>
 				<onup>21</onup>
-				<textcolor>-</textcolor>
+				<textcolor></textcolor>
 				<showonepage>true</showonepage>
 			</control>
 			<control type="textbox" id="22">
@@ -924,7 +924,7 @@
 				<font>font12</font>
 				<align>justify</align>
 				<pagecontrol>60</pagecontrol>
-				<label>-</label>
+				<label></label>
 			</control>
 		</control>
 		<control type="grouplist" id="9000">
diff --git a/720p/DialogPictureInfo.xml b/720p/DialogPictureInfo.xml
index fbbb55e..3f58daa 100644
--- a/720p/DialogPictureInfo.xml
+++ b/720p/DialogPictureInfo.xml
@@ -53,8 +53,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogPlayerProcessInfo.xml b/720p/DialogPlayerProcessInfo.xml
index ef24641..c5c2622 100644
--- a/720p/DialogPlayerProcessInfo.xml
+++ b/720p/DialogPlayerProcessInfo.xml
@@ -411,7 +411,7 @@
 				<top>147</top>
 				<width>275</width>
 				<height>14</height>
-				<overlaytexture>-</overlaytexture>
+				<overlaytexture></overlaytexture>
 				<info>PVR.ActStreamProgrSNR</info>
 			</control>
 			<control type="label">
diff --git a/720p/DialogSelect.xml b/720p/DialogSelect.xml
index c2a1282..2e436a8 100644
--- a/720p/DialogSelect.xml
+++ b/720p/DialogSelect.xml
@@ -83,8 +83,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -307,7 +307,7 @@
 						<description>Manual button</description>
 						<width>200</width>
 						<height>40</height>
-						<label>-</label>
+						<label></label>
 						<font>font12_title</font>
 						<textcolor>white</textcolor>
 						<focusedcolor>white</focusedcolor>
@@ -317,7 +317,7 @@
 						<description>Cancel button</description>
 						<width>200</width>
 						<height>40</height>
-						<label>-</label>
+						<label></label>
 						<font>font12_title</font>
 						<textcolor>white</textcolor>
 						<focusedcolor>white</focusedcolor>
diff --git a/720p/DialogSlider.xml b/720p/DialogSlider.xml
index df80453..4de5252 100644
--- a/720p/DialogSlider.xml
+++ b/720p/DialogSlider.xml
@@ -45,8 +45,8 @@
 			<width>420</width>
 			<height>20</height>
 			<aligny>center</aligny>
-			<texturefocus>-</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturefocus></texturefocus>
+			<texturenofocus></texturenofocus>
 			<texturesliderbar>osd_slider_bg_2.png</texturesliderbar>
 			<textureslidernib>osd_slider_nibNF.png</textureslidernib>
 			<textureslidernibfocus>osd_slider_nib.png</textureslidernibfocus>
diff --git a/720p/DialogSubtitles.xml b/720p/DialogSubtitles.xml
index 0610a92..74821e5 100644
--- a/720p/DialogSubtitles.xml
+++ b/720p/DialogSubtitles.xml
@@ -17,10 +17,10 @@
 				<top>0</top>
 				<width>80</width>
 				<height>720</height>
-				<label>-</label>
-				<font>-</font>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
+				<label></label>
+				<font></font>
+				<texturenofocus></texturenofocus>
+				<texturefocus></texturefocus>
 				<visible>true</visible>
 				<onfocus>SetFocus(150)</onfocus>
 			</control>
@@ -39,8 +39,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/DialogTextViewer.xml b/720p/DialogTextViewer.xml
index f384d39..32dafbb 100644
--- a/720p/DialogTextViewer.xml
+++ b/720p/DialogTextViewer.xml
@@ -19,8 +19,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -51,7 +51,7 @@
 					<top>92</top>
 					<width>1000</width>
 					<height>598</height>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 					<align>justify</align>
 					<textcolor>white</textcolor>
diff --git a/720p/DialogVideoInfo.xml b/720p/DialogVideoInfo.xml
index d2ca645..f21be47 100644
--- a/720p/DialogVideoInfo.xml
+++ b/720p/DialogVideoInfo.xml
@@ -20,8 +20,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -140,7 +140,7 @@
 						<onright>49</onright>
 						<onup>9000</onup>
 						<ondown>61</ondown>
-						<pagecontrol>-</pagecontrol>
+						<pagecontrol></pagecontrol>
 						<scrolltime>200</scrolltime>
 						<itemlayout height="30">
 							<control type="label">
@@ -326,7 +326,7 @@
 						<onright>49</onright>
 						<onup>9000</onup>
 						<ondown>61</ondown>
-						<pagecontrol>-</pagecontrol>
+						<pagecontrol></pagecontrol>
 						<scrolltime>200</scrolltime>
 						<itemlayout height="30">
 							<control type="label">
@@ -477,7 +477,7 @@
 						<onright>49</onright>
 						<onup>9000</onup>
 						<ondown>61</ondown>
-						<pagecontrol>-</pagecontrol>
+						<pagecontrol></pagecontrol>
 						<scrolltime>200</scrolltime>
 						<itemlayout height="30">
 							<control type="label">
@@ -648,7 +648,7 @@
 						<onright>49</onright>
 						<onup>9000</onup>
 						<ondown>61</ondown>
-						<pagecontrol>-</pagecontrol>
+						<pagecontrol></pagecontrol>
 						<scrolltime>200</scrolltime>
 						<itemlayout height="30">
 							<control type="label">
@@ -816,12 +816,12 @@
 					<left>120r</left>
 					<top>485</top>
 					<subtype>page</subtype>
-					<font>-</font>
+					<font></font>
 					<onleft>61</onleft>
 					<onright>61</onright>
 					<ondown>9000</ondown>
 					<onup>49</onup>
-					<textcolor>-</textcolor>
+					<textcolor></textcolor>
 					<showonepage>true</showonepage>
 				</control>
 				<control type="textbox" id="400">
diff --git a/720p/EventLog.xml b/720p/EventLog.xml
index d143bcb..09139b4 100644
--- a/720p/EventLog.xml
+++ b/720p/EventLog.xml
@@ -213,7 +213,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
@@ -231,12 +231,12 @@
 					<description>Level button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="radiobutton" id="22">
 					<description>Only show current level</description>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="20">
 					<description>Clear button</description>
diff --git a/720p/FileBrowser.xml b/720p/FileBrowser.xml
index 39f86f8..fd42c89 100644
--- a/720p/FileBrowser.xml
+++ b/720p/FileBrowser.xml
@@ -43,8 +43,8 @@
 				<top>0</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/FileManager.xml b/720p/FileManager.xml
index 2e00294..3cfe47e 100644
--- a/720p/FileManager.xml
+++ b/720p/FileManager.xml
@@ -81,8 +81,8 @@
 				<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>-</textureslidernib>
-				<textureslidernibfocus>-</textureslidernibfocus>
+				<textureslidernib></textureslidernib>
+				<textureslidernibfocus></textureslidernibfocus>
 				<onleft>31</onleft>
 				<onright>20</onright>
 				<ondown>20</ondown>
@@ -255,8 +255,8 @@
 				<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>-</textureslidernib>
-				<textureslidernibfocus>-</textureslidernibfocus>
+				<textureslidernib></textureslidernib>
+				<textureslidernibfocus></textureslidernibfocus>
 				<onleft>21</onleft>
 				<onright>30</onright>
 				<ondown>21</ondown>
@@ -400,7 +400,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>1036</label>
-				<font>-</font>
+				<font></font>
 				<onclick>back</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -425,7 +425,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font>-</font>
+				<font></font>
 				<onclick>ActivateWindow(home)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
diff --git a/720p/Home.xml b/720p/Home.xml
index f54a6d7..2886689 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -477,10 +477,10 @@
 			<top>-20</top>
 			<width>1</width>
 			<height>1</height>
-			<label>-</label>
-			<font>-</font>
-			<texturefocus>-</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<label></label>
+			<font></font>
+			<texturefocus></texturefocus>
+			<texturenofocus></texturenofocus>
 			<onleft>9000</onleft>
 			<onright>9000</onright>
 			<onup>20</onup>
@@ -545,7 +545,7 @@
 				<left>180</left>
 				<onup>9003</onup>
 				<ondown>9000</ondown>
-				<defaultcontrol>-</defaultcontrol>
+				<defaultcontrol></defaultcontrol>
 				<enable>Player.HasMedia</enable>
 				<control type="image">
 					<description>Background image</description>
@@ -563,7 +563,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDPrevTrackFO.png</texturefocus>
 						<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 						<onleft>608</onleft>
@@ -577,7 +577,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDRewindFO.png</texturefocus>
 						<texturenofocus>OSDRewindNF.png</texturenofocus>
 						<onleft>601</onleft>
@@ -591,7 +591,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDPauseFO.png</texturefocus>
 						<texturenofocus>OSDPauseNF.png</texturenofocus>
 						<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -608,7 +608,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDStopFO.png</texturefocus>
 						<texturenofocus>OSDStopNF.png</texturenofocus>
 						<onleft>603</onleft>
@@ -623,7 +623,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDForwardFO.png</texturefocus>
 						<texturenofocus>OSDForwardNF.png</texturenofocus>
 						<onleft>604</onleft>
@@ -637,7 +637,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDNextTrackFO.png</texturefocus>
 						<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 						<onleft>605</onleft>
@@ -654,7 +654,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDChannelUPFO.png</texturefocus>
 						<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 						<onleft>608</onleft>
@@ -668,7 +668,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDChannelDownFO.png</texturefocus>
 						<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 						<onleft>601</onleft>
@@ -682,7 +682,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDStopFO.png</texturefocus>
 						<texturenofocus>OSDStopNF.png</texturenofocus>
 						<onleft>602</onleft>
@@ -697,7 +697,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDPauseFO.png</texturefocus>
 						<texturenofocus>OSDPauseNF.png</texturenofocus>
 						<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -716,7 +716,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDRadioRDSFO.png</texturefocus>
 						<texturenofocus>OSDRadioRDSNF.png</texturenofocus>
 						<onleft>604</onleft>
@@ -732,7 +732,7 @@
 						<top>2</top>
 						<width>30</width>
 						<height>30</height>
-						<label>-</label>
+						<label></label>
 						<texturefocus>OSDRecordOffFO.png</texturefocus>
 						<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 						<onleft>605</onleft>
@@ -887,7 +887,7 @@
 				<onup condition="System.HasAddon(script.globalsearch)">608</onup>
 				<onup condition="!System.HasAddon(script.globalsearch)">603</onup>
 				<ondown>9001</ondown>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<scrolltime>300</scrolltime>
 				<focusposition>2</focusposition>
 				<movement>1</movement>
@@ -964,81 +964,81 @@
 						<label>31950</label>
 						<onclick condition="!String.IsEmpty(Weather.Plugin)">ActivateWindow(Weather)</onclick>
 						<onclick condition="String.IsEmpty(Weather.Plugin)">ActivateWindow(servicesettings,weather)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoWeatherButton)</visible>
 					</item>
 					<item id="4">
 						<label>31951</label>
 						<onclick>ActivateWindow(Pictures)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoPicturesButton)</visible>
 					</item>
 					<item id="13">
 						<label>31960</label>
 						<onclick>ActivateWindow(RadioChannels)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>PVR.HasRadioChannels</visible>
 					</item>
 					<item id="12">
 						<label>31952</label>
 						<onclick>ActivateWindow(TVChannels)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>PVR.HasTVChannels</visible>
 					</item>
 					<item id="2">
 						<label>31953</label>
 						<onclick condition="String.IsEqual(Window.Property(VideosDirectLink),True)">ActivateWindow(Videos)</onclick>
 						<onclick condition="!String.IsEqual(Window.Property(VideosDirectLink),True)">ActivateWindow(Videos,root)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoVideosButton)</visible>
 					</item>
 					<item id="10">
 						<label>31954</label>
 						<onclick>ActivateWindow(Videos,MovieTitles,return)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoMovieButton) + Library.HasContent(Movies)</visible>
 					</item>
 					<item id="11">
 						<label>31955</label>
 						<onclick>ActivateWindow(Videos,TVShowTitles,return)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoTVShowButton) + Library.HasContent(TVShows)</visible>
 					</item>
 					<item id="3">
 						<label>31956</label>
 						<onclick condition="String.IsEqual(Window.Property(MusicDirectLink),True)">ActivateWindow(Music)</onclick>
 						<onclick condition="!String.IsEqual(Window.Property(MusicDirectLink),True)">ActivateWindow(Music,root)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoMusicButton)</visible>
 					</item>
 					<item id="1">
 						<label>31957</label>
 						<onclick condition="!System.Platform.Android">ActivateWindow(Programs,Addons,return)</onclick>
 						<onclick condition="System.Platform.Android">ActivateWindow(Programs)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>!Skin.HasSetting(HomeMenuNoProgramsButton)</visible>
 					</item>
 					<item id="6">
 						<label>31958</label>
 						<onclick>PlayDVD()</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 						<visible>System.HasMediaDVD</visible>
 					</item>
 					<item id="5">
 						<label>31959</label>
 						<onclick>ActivateWindow(Settings)</onclick>
-						<icon>-</icon>
-						<thumb>-</thumb>
+						<icon></icon>
+						<thumb></thumb>
 					</item>
 				</content>
 			</control>
@@ -1149,7 +1149,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font>-</font>
+				<font></font>
 				<onclick>ActivateWindow(ShutdownMenu)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -1174,7 +1174,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>1036</label>
-				<font>-</font>
+				<font></font>
 				<onclick>ActivateWindow(Favourites)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
diff --git a/720p/Includes.xml b/720p/Includes.xml
index 9353549..b9a374c 100644
--- a/720p/Includes.xml
+++ b/720p/Includes.xml
@@ -272,8 +272,8 @@
 			<top>15</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -316,7 +316,7 @@
 		<aligny>center</aligny>
 		<font>font13</font>
 		<texturefocus border="5">button-focus.png</texturefocus>
-		<texturenofocus>-</texturenofocus>
+		<texturenofocus></texturenofocus>
 		<pulseonselect>false</pulseonselect>
 	</include>
 	<include name="ButtonMediaSubCommonValues">
@@ -380,10 +380,10 @@
 			<top>0</top>
 			<width>250</width>
 			<height>720</height>
-			<label>-</label>
-			<font>-</font>
-			<texturenofocus>-</texturenofocus>
-			<texturefocus>-</texturefocus>
+			<label></label>
+			<font></font>
+			<texturenofocus></texturenofocus>
+			<texturefocus></texturefocus>
 			<visible>true</visible>
 		</control>
 		<control type="button" id="9001">
@@ -391,7 +391,7 @@
 			<top>260</top>
 			<width>42</width>
 			<height>128</height>
-			<font>-</font>
+			<font></font>
 			<texturefocus>HasSub.png</texturefocus>
 			<texturenofocus>HasSub.png</texturenofocus>
 		</control>
@@ -426,7 +426,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>1036</label>
-				<font>-</font>
+				<font></font>
 				<onclick>back</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -451,7 +451,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font>-</font>
+				<font></font>
 				<onclick>ActivateWindow(home)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -484,7 +484,7 @@
 				<width>45</width>
 				<height>45</height>
 				<label>31003</label>
-				<font>-</font>
+				<font></font>
 				<onclick>ActivateWindow(PlayerControls)</onclick>
 				<texturefocus border="5">floor_buttonFO.png</texturefocus>
 				<texturenofocus border="5">floor_button.png</texturenofocus>
@@ -865,7 +865,7 @@
 				<control type="button" id="600">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDChannelUPFO.png</texturefocus>
 					<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 					<onclick>ChannelDown</onclick>
@@ -873,7 +873,7 @@
 				<control type="button" id="601">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDChannelDownFO.png</texturefocus>
 					<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 					<onclick>ChannelUp</onclick>
@@ -881,7 +881,7 @@
 				<control type="button" id="603">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDStopFO.png</texturefocus>
 					<texturenofocus>OSDStopNF.png</texturenofocus>
 					<onclick>down</onclick>
@@ -890,7 +890,7 @@
 				<control type="togglebutton" id="604">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDPauseFO.png</texturefocus>
 					<texturenofocus>OSDPauseNF.png</texturenofocus>
 					<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -903,7 +903,7 @@
 				<control type="button" id="605">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDRecordOffFO.png</texturefocus>
 					<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 					<onclick>PlayerControl(record)</onclick>
@@ -913,7 +913,7 @@
 				<control type="button" id="606">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<visible>RDS.HasRadiotextPlus</visible>
 					<texturefocus>OSDRadioRDSFO.png</texturefocus>
 					<texturenofocus>OSDRadioRDSNF.png</texturenofocus>
@@ -922,7 +922,7 @@
 				<control type="button" id="622">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<visible>!RDS.HasRadiotextPlus</visible>
 					<texturefocus>OSDChannelListFO.png</texturefocus>
 					<texturenofocus>OSDChannelListNF.png</texturenofocus>
@@ -948,7 +948,7 @@
 				<control type="button" id="700">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDPrevTrackFO.png</texturefocus>
 					<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 					<onclick>PlayerControl(Previous)</onclick>
@@ -956,7 +956,7 @@
 				<control type="button" id="706">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDRewindFO.png</texturefocus>
 					<texturenofocus>OSDRewindNF.png</texturenofocus>
 					<onclick>PlayerControl(Rewind)</onclick>
@@ -965,7 +965,7 @@
 				<control type="togglebutton" id="703">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDPauseFO.png</texturefocus>
 					<texturenofocus>OSDPauseNF.png</texturenofocus>
 					<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -976,7 +976,7 @@
 				<control type="button" id="701">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDStopFO.png</texturefocus>
 					<texturenofocus>OSDStopNF.png</texturenofocus>
 					<onclick>down</onclick>
@@ -985,7 +985,7 @@
 				<control type="button" id="707">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDForwardFO.png</texturefocus>
 					<texturenofocus>OSDForwardNF.png</texturenofocus>
 					<onclick>PlayerControl(Forward)</onclick>
@@ -994,7 +994,7 @@
 				<control type="button" id="702">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDNextTrackFO.png</texturefocus>
 					<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 					<onclick>PlayerControl(Next)</onclick>
@@ -1005,9 +1005,9 @@
 					<control type="button" id="704">
 						<width>39</width>
 						<height>39</height>
-						<label>-</label>
-						<texturefocus>-</texturefocus>
-						<texturenofocus>-</texturenofocus>
+						<label></label>
+						<texturefocus></texturefocus>
+						<texturenofocus></texturenofocus>
 						<onleft>702</onleft>
 						<onright>705</onright>
 						<onclick>PlayerControl(Repeat)</onclick>
@@ -1023,7 +1023,7 @@
 				<control type="togglebutton" id="705">
 					<width>39</width>
 					<height>39</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDRandomOffFO.png</texturefocus>
 					<texturenofocus>OSDRandomOffNF.png</texturenofocus>
 					<usealttexture>Playlist.IsRandom</usealttexture>
@@ -1112,7 +1112,7 @@
 		<top>190r</top>
 		<width>1280</width>
 		<height>200</height>
-		<pagecontrol>-</pagecontrol>
+		<pagecontrol></pagecontrol>
 		<scrolltime>300</scrolltime>
 		<focusposition>3</focusposition>
 		<movement>2</movement>
diff --git a/720p/IncludesHomeMenuItems.xml b/720p/IncludesHomeMenuItems.xml
index 3d7849c..1c15ec0 100644
--- a/720p/IncludesHomeMenuItems.xml
+++ b/720p/IncludesHomeMenuItems.xml
@@ -361,35 +361,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton1))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton2))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton3))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton4))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeVideosButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeVideosButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeVideosButton5))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeVideosButton5))</visible>
 		</item>
 	</include>
@@ -398,35 +398,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton1))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton2))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton3))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton4))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeMusicButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeMusicButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeMusicButton5))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeMusicButton5))</visible>
 		</item>
 	</include>
@@ -435,35 +435,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton1))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton2))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton3))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton4))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomePictureButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomePictureButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomePictureButton5))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomePictureButton5))</visible>
 		</item>
 	</include>
@@ -472,35 +472,35 @@
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton1))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton1)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton1))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton1))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton2))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton2)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton2))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton2))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton3))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton3)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton3))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton3))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton4))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton4)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton4))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton4))</visible>
 		</item>
 		<item>
 			<label>$INFO[system.addontitle(Skin.String(HomeProgramButton5))]</label>
 			<onclick>RunAddon($INFO[Skin.String(HomeProgramButton5)])</onclick>
 			<icon>$INFO[system.addonicon(Skin.String(HomeProgramButton5))]</icon>
-			<thumb>-</thumb>
+			<thumb></thumb>
 			<visible>!String.IsEmpty(Skin.String(HomeProgramButton5))</visible>
 		</item>
 	</include>
diff --git a/720p/IncludesHomeRecentlyAdded.xml b/720p/IncludesHomeRecentlyAdded.xml
index 531e88a..553b73d 100644
--- a/720p/IncludesHomeRecentlyAdded.xml
+++ b/720p/IncludesHomeRecentlyAdded.xml
@@ -44,7 +44,7 @@
 					<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
 					<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 					<viewtype label="535">list</viewtype>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<scrolltime>200</scrolltime>
 					<orientation>Horizontal</orientation>
 					<itemlayout height="220" width="180">
@@ -145,7 +145,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.1.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.1.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.1.Title))</visible>
 						</item>
 						<item>
@@ -153,7 +153,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.2.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.2.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.2.Title))</visible>
 						</item>
 						<item>
@@ -161,7 +161,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.3.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.3.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.3.Title))</visible>
 						</item>
 						<item>
@@ -169,7 +169,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.4.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.4.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.4.Title))</visible>
 						</item>
 						<item>
@@ -177,7 +177,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.5.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.5.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.5.Title))</visible>
 						</item>
 						<item>
@@ -185,7 +185,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.6.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.6.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.6.Title))</visible>
 						</item>
 						<item>
@@ -193,7 +193,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.7.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.7.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.7.Title))</visible>
 						</item>
 						<item>
@@ -201,7 +201,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.8.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.8.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.8.Title))</visible>
 						</item>
 						<item>
@@ -209,7 +209,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.9.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.9.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.9.Title))</visible>
 						</item>
 						<item>
@@ -217,7 +217,7 @@
 							<label2 />
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestMovie.10.Path)])</onclick>
 							<icon>$INFO[Window.Property(LatestMovie.10.Thumb)]</icon>
-							<thumb>-</thumb>
+							<thumb></thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestMovie.10.Title))</visible>
 						</item>
 					</content>
@@ -280,7 +280,7 @@
 					<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
 					<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 					<viewtype label="535">list</viewtype>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<scrolltime>200</scrolltime>
 					<orientation>Horizontal</orientation>
 					<itemlayout height="220" width="240">
@@ -406,7 +406,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.1.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.1.ShowTitle)] - $INFO[Window.Property(LatestEpisode.1.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.1.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.1.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.1.EpisodeTitle))</visible>
 						</item>
@@ -414,7 +414,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.2.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.2.ShowTitle)] - $INFO[Window.Property(LatestEpisode.2.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.2.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.2.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.2.EpisodeTitle))</visible>
 						</item>
@@ -422,7 +422,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.3.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.3.ShowTitle)] - $INFO[Window.Property(LatestEpisode.3.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.3.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.3.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.3.EpisodeTitle))</visible>
 						</item>
@@ -430,7 +430,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.4.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.4.ShowTitle)] - $INFO[Window.Property(LatestEpisode.4.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.4.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.4.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.4.EpisodeTitle))</visible>
 						</item>
@@ -438,7 +438,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.5.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.5.ShowTitle)] - $INFO[Window.Property(LatestEpisode.5.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.5.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.5.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.5.EpisodeTitle))</visible>
 						</item>
@@ -446,7 +446,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.6.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.6.ShowTitle)] - $INFO[Window.Property(LatestEpisode.6.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.6.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.6.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.6.EpisodeTitle))</visible>
 						</item>
@@ -454,7 +454,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.7.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.7.ShowTitle)] - $INFO[Window.Property(LatestEpisode.7.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.7.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.7.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.7.EpisodeTitle))</visible>
 						</item>
@@ -462,7 +462,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.8.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.8.ShowTitle)] - $INFO[Window.Property(LatestEpisode.8.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.8.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.8.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.8.EpisodeTitle))</visible>
 						</item>
@@ -470,7 +470,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.9.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.9.ShowTitle)] - $INFO[Window.Property(LatestEpisode.9.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.9.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.9.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.9.EpisodeTitle))</visible>
 						</item>
@@ -478,7 +478,7 @@
 							<label>$INFO[Window.Property(LatestEpisode.10.EpisodeTitle)]</label>
 							<label2>$INFO[Window.Property(LatestEpisode.10.ShowTitle)] - $INFO[Window.Property(LatestEpisode.10.EpisodeNo)]</label2>
 							<onclick>PlayMedia($ESCINFO[Window.Property(LatestEpisode.10.Path)])</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestEpisode.10.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestEpisode.10.EpisodeTitle))</visible>
 						</item>
@@ -542,7 +542,7 @@
 					<ondown condition="System.HasAddon(script.globalsearch)">608</ondown>
 					<ondown condition="!System.HasAddon(script.globalsearch)">603</ondown>
 					<viewtype label="535">list</viewtype>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<scrolltime>200</scrolltime>
 					<orientation>Horizontal</orientation>
 					<itemlayout height="220" width="200">
@@ -669,7 +669,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.1.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.1.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.1.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.1.Title))</visible>
 						</item>
@@ -678,7 +678,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.2.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.2.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.2.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.2.Title))</visible>
 						</item>
@@ -687,7 +687,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.3.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.3.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.3.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.3.Title))</visible>
 						</item>
@@ -696,7 +696,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.4.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.4.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.4.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.4.Title))</visible>
 						</item>
@@ -705,7 +705,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.5.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.5.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.5.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.5.Title))</visible>
 						</item>
@@ -714,7 +714,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.6.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.6.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.6.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.6.Title))</visible>
 						</item>
@@ -723,7 +723,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.7.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.7.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.7.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.7.Title))</visible>
 						</item>
@@ -732,7 +732,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.8.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.8.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.8.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.8.Title))</visible>
 						</item>
@@ -741,7 +741,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.9.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.9.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.9.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.9.Title))</visible>
 						</item>
@@ -750,7 +750,7 @@
 							<label2>$INFO[Window.Property(LatestAlbum.10.Artist)]</label2>
 							<onclick>PlayList.Clear</onclick>
 							<onclick>PlayMedia("$INFO[Window.Property(LatestAlbum.10.Path)]")</onclick>
-							<icon>-</icon>
+							<icon></icon>
 							<thumb>$INFO[Window.Property(LatestAlbum.10.Thumb)]</thumb>
 							<visible>!String.IsEmpty(Window.Property(LatestAlbum.10.Title))</visible>
 						</item>
diff --git a/720p/IncludesPVR.xml b/720p/IncludesPVR.xml
index 5cf8dd3..05ebaae 100644
--- a/720p/IncludesPVR.xml
+++ b/720p/IncludesPVR.xml
@@ -165,13 +165,13 @@
 					<description>Channel Groups</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="2">
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 					<!-- <visible>Window.IsActive(TVGuide) | Window.IsActive(RadioGuide)</visible> -->
 				</control>
 				<control type="button" id="3">
@@ -183,7 +183,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
diff --git a/720p/LoginScreen.xml b/720p/LoginScreen.xml
index 5c235e5..25d9dbc 100644
--- a/720p/LoginScreen.xml
+++ b/720p/LoginScreen.xml
@@ -188,8 +188,8 @@
 					<top>0</top>
 					<width>45</width>
 					<height>45</height>
-					<label>-</label>
-					<font>-</font>
+					<label></label>
+					<font></font>
 					<onclick>ActivateWindow(ShutdownMenu)</onclick>
 					<texturefocus border="5">floor_buttonFO.png</texturefocus>
 					<texturenofocus border="5">floor_button.png</texturenofocus>
diff --git a/720p/MusicOSD.xml b/720p/MusicOSD.xml
index 62e8cc7..b9c6663 100644
--- a/720p/MusicOSD.xml
+++ b/720p/MusicOSD.xml
@@ -15,8 +15,8 @@
 			<top>0</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>Dialog.Close(MusicOSD,true)</onclick>
 			<onclick>FullScreen</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
@@ -52,7 +52,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>210</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDChannelUPFO.png</texturefocus>
 				<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 				<onclick>PlayerControl(Previous)</onclick>
@@ -62,7 +62,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>209</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDChannelDownFO.png</texturefocus>
 				<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 				<onclick>PlayerControl(Next)</onclick>
@@ -72,7 +72,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>210</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDPrevTrackFO.png</texturefocus>
 				<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 				<onclick>PlayerControl(Previous)</onclick>
@@ -82,7 +82,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31354</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRewindFO.png</texturefocus>
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
 				<animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation>
@@ -94,7 +94,7 @@
 				<height>55</height>
 				<label>31351</label>
 				<altlabel>208</altlabel>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDPauseFO.png</texturefocus>
 				<texturenofocus>OSDPauseNF.png</texturenofocus>
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -108,7 +108,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31352</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDStopFO.png</texturefocus>
 				<texturenofocus>OSDStopNF.png</texturenofocus>
 				<onclick>PlayerControl(Stop)</onclick>
@@ -117,7 +117,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31353</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDForwardFO.png</texturefocus>
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
 				<animation effect="fade" start="100" end="50" time="75" condition="!Player.SeekEnabled">Conditional</animation>
@@ -128,7 +128,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>209</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDNextTrackFO.png</texturefocus>
 				<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 				<visible>!MusicPlayer.Content(LiveTV)</visible>
@@ -138,7 +138,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>19019</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDChannelListFO.png</texturefocus>
 				<texturenofocus>OSDChannelListNF.png</texturenofocus>
 				<onclick>ActivateWindow(PVROSDChannels)</onclick>
@@ -148,7 +148,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>$LOCALIZE[19029]$INFO[MusicPlayer.ChannelName, - ]</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDepgFO.png</texturefocus>
 				<texturenofocus>OSDepgNF.png</texturenofocus>
 				<onclick>ActivateWindow(PVROSDGuide)</onclick>
@@ -159,7 +159,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>209</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRadioRDSFO.png</texturefocus>
 				<texturenofocus>OSDRadioRDSNF.png</texturenofocus>
 				<onclick>ActivateWindow(PVRRadioRDSInfo)</onclick>
@@ -175,9 +175,9 @@
 					<width>55</width>
 					<height>55</height>
 					<label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label>
-					<font>-</font>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
+					<font></font>
+					<texturefocus></texturefocus>
+					<texturenofocus></texturenofocus>
 					<onleft>605</onleft>
 					<onright>607</onright>
 					<onclick>PlayerControl(Repeat)</onclick>
@@ -241,7 +241,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>$LOCALIZE[590]$INFO[Playlist.Random, : ]</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRandomOffFO.png</texturefocus>
 				<texturenofocus>OSDRandomOffNF.png</texturenofocus>
 				<usealttexture>Playlist.IsRandom</usealttexture>
@@ -252,28 +252,28 @@
 			</control>
 			<control type="image" id="2300">
 				<width>105</width>
-				<texture>-</texture>
+				<texture></texture>
 			</control>
 			<control type="image" id="2400">
 				<width>55</width>
-				<texture>-</texture>
+				<texture></texture>
 				<visible>!system.getbool(audiooutput.dspaddonsenabled)</visible>
 			</control>
 			<control type="image" id="2500">
 				<width>55</width>
-				<texture>-</texture>
+				<texture></texture>
 				<visible>MusicPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="image" id="2600">
 				<width>55</width>
-				<texture>-</texture>
+				<texture></texture>
 				<visible>!Player.CanRecord</visible>
 			</control>
 			<control type="button" id="705">
 				<width>55</width>
 				<height>55</height>
 				<label>15047</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRateFO.png</texturefocus>
 				<texturenofocus>OSDRateNF.png</texturenofocus>
 				<onclick>setrating</onclick>
@@ -282,7 +282,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>15047</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDDSPAudioFO.png</texturefocus>
 				<texturenofocus>OSDDSPAudioNF.png</texturenofocus>
 				<onclick>ActivateWindow(OSDAudioDSPSettings)</onclick>
@@ -292,7 +292,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31128</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDLyricsFO.png</texturefocus>
 				<texturenofocus>OSDLyricsNF.png</texturenofocus>
 				<alttexturefocus>OSDLyricsFO.png</alttexturefocus>
@@ -309,7 +309,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>12006</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDVizFO.png</texturefocus>
 				<texturenofocus>OSDVizNF.png</texturenofocus>
 			</control>
@@ -317,7 +317,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>$LOCALIZE[250] $LOCALIZE[21417]</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDPresetSettingsFO.png</texturefocus>
 				<texturenofocus>OSDPresetSettingsNF.png</texturenofocus>
 				<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
@@ -326,7 +326,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31048</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDPreFO.png</texturefocus>
 				<texturenofocus>OSDPreNF.png</texturenofocus>
 				<onclick>ActivateWindow(visualisationpresetlist)</onclick>
@@ -337,7 +337,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>264</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 				<onclick>PlayerControl(record)</onclick>
diff --git a/720p/MusicVisualisation.xml b/720p/MusicVisualisation.xml
index 0f03261..05f68e3 100644
--- a/720p/MusicVisualisation.xml
+++ b/720p/MusicVisualisation.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol>-</defaultcontrol>
+	<defaultcontrol></defaultcontrol>
 	<controls>
 		<control type="visualisation" id="2">
 			<!-- FIX ME Music Visualization needs to have an id of 2 in this window to be able to lock or change preset -->
diff --git a/720p/MyMusicNav.xml b/720p/MyMusicNav.xml
index e9cc2ce..297dcbf 100644
--- a/720p/MyMusicNav.xml
+++ b/720p/MyMusicNav.xml
@@ -69,7 +69,7 @@
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="3">
 					<description>Sort by button</description>
@@ -80,7 +80,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
@@ -145,7 +145,7 @@
 					<label>653</label>
 					<altlabel>13353</altlabel>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<usealttexture>library.isscanningmusic</usealttexture>
 				</control>
 				<control type="button" id="204">
diff --git a/720p/MyMusicPlaylistEditor.xml b/720p/MyMusicPlaylistEditor.xml
index dd13311..54dc211 100644
--- a/720p/MyMusicPlaylistEditor.xml
+++ b/720p/MyMusicPlaylistEditor.xml
@@ -89,7 +89,7 @@
 					<align>center</align>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<label>$INFO[Container(50).ListItem.Title,[COLOR=blue]$LOCALIZE[556]:[/COLOR] ,[CR]]$INFO[Container(50).ListItem.Artist,[COLOR=blue]$LOCALIZE[557]:[/COLOR] ,[CR]]$INFO[Container(50).ListItem.Album,[COLOR=blue]$LOCALIZE[558]:[/COLOR] ,[CR]]$INFO[Container(50).ListItem.Duration,[COLOR=blue]$LOCALIZE[555]:[/COLOR] ,[CR]]$INFO[Container(50).ListItem.TrackNumber,[COLOR=blue]$LOCALIZE[554]:[/COLOR] ,[CR]]$INFO[Container(50).ListItem.Genre,[COLOR=blue]$LOCALIZE[515]:[/COLOR] ,[CR]]</label>
 				</control>
 			</control>
@@ -113,7 +113,7 @@
 					<align>center</align>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<label>$INFO[Container(100).ListItem.Title,[COLOR=blue]$LOCALIZE[556]:[/COLOR] ,[CR]]$INFO[Container(100).ListItem.Artist,[COLOR=blue]$LOCALIZE[557]:[/COLOR] ,[CR]]$INFO[Container(100).ListItem.Album,[COLOR=blue]$LOCALIZE[558]:[/COLOR] ,[CR]]$INFO[Container(100).ListItem.Duration,[COLOR=blue]$LOCALIZE[555]:[/COLOR] ,[CR]]$INFO[Container(100).ListItem.TrackNumber,[COLOR=blue]$LOCALIZE[554]:[/COLOR] ,[CR]]$INFO[Container(100).ListItem.Genre,[COLOR=blue]$LOCALIZE[515]:[/COLOR] ,[CR]]</label>
 				</control>
 			</control>
diff --git a/720p/MyPVRChannels.xml b/720p/MyPVRChannels.xml
index ce417a6..10bb9e0 100644
--- a/720p/MyPVRChannels.xml
+++ b/720p/MyPVRChannels.xml
@@ -69,8 +69,8 @@
 				<width>692</width>
 				<height>402</height>
 				<texturefocus border="3">VideoWindowFO.png</texturefocus>
-				<texturenofocus>-</texturenofocus>
-				<font>-</font>
+				<texturenofocus></texturenofocus>
+				<font></font>
 				<pulseonselect>no</pulseonselect>
 				<onleft>70</onleft>
 				<onclick>Fullscreen</onclick>
@@ -180,7 +180,7 @@
 					<align>justify</align>
 					<textcolor>white</textcolor>
 					<shadowcolor>black</shadowcolor>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<label>$INFO[Container(50).ListItem.Plot]</label>
 					<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
 				</control>
diff --git a/720p/MyPics.xml b/720p/MyPics.xml
index 5846f4f..1aebac8 100644
--- a/720p/MyPics.xml
+++ b/720p/MyPics.xml
@@ -75,7 +75,7 @@
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="3">
 					<description>Sort by button</description>
@@ -86,7 +86,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
diff --git a/720p/MyPlaylist.xml b/720p/MyPlaylist.xml
index 470b82c..5d9fc4c 100644
--- a/720p/MyPlaylist.xml
+++ b/720p/MyPlaylist.xml
@@ -59,7 +59,7 @@
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="label" id="201">
 					<width>250</width>
@@ -79,7 +79,7 @@
 					<description>Repeat button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="21">
 					<description>Save button</description>
diff --git a/720p/MyPrograms.xml b/720p/MyPrograms.xml
index 5e1a44d..87b9068 100644
--- a/720p/MyPrograms.xml
+++ b/720p/MyPrograms.xml
@@ -59,7 +59,7 @@
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="3">
 					<description>Sort by button</description>
@@ -70,7 +70,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
diff --git a/720p/MyVideoNav.xml b/720p/MyVideoNav.xml
index c6a2ab9..d27b4ef 100644
--- a/720p/MyVideoNav.xml
+++ b/720p/MyVideoNav.xml
@@ -75,7 +75,7 @@
 					<description>View As button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
-					<label>-</label>
+					<label></label>
 				</control>
 				<control type="button" id="3">
 					<description>Sort by button</description>
@@ -86,7 +86,7 @@
 					<description>Sort asc</description>
 					<include>ButtonCommonValues</include>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<label>31051</label>
 					<altlabel>31050</altlabel>
 					<usealttexture>Container.SortDirection(Ascending)</usealttexture>
@@ -167,7 +167,7 @@
 					<label>653</label>
 					<altlabel>13353</altlabel>
 					<alttexturefocus border="5">button-focus.png</alttexturefocus>
-					<alttexturenofocus>-</alttexturenofocus>
+					<alttexturenofocus></alttexturenofocus>
 					<usealttexture>library.isscanningvideo</usealttexture>
 				</control>
 				<control type="button" id="204">
diff --git a/720p/MyWeather.xml b/720p/MyWeather.xml
index 96cf294..6e5ce84 100644
--- a/720p/MyWeather.xml
+++ b/720p/MyWeather.xml
@@ -470,7 +470,7 @@
 						<description>change location button</description>
 						<left>0</left>
 						<top>0</top>
-						<font>-</font>
+						<font></font>
 						<include>ButtonCommonValues</include>
 						<onleft>50</onleft>
 						<onright>50</onright>
diff --git a/720p/PlayerControls.xml b/720p/PlayerControls.xml
index 91f5a1d..c8d2d25 100644
--- a/720p/PlayerControls.xml
+++ b/720p/PlayerControls.xml
@@ -25,7 +25,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDPrevTrackFO.png</texturefocus>
 				<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 				<onleft>609</onleft>
@@ -40,7 +40,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDRewindFO.png</texturefocus>
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
 				<onleft>600</onleft>
@@ -55,7 +55,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDPauseFO.png</texturefocus>
 				<texturenofocus>OSDPauseNF.png</texturenofocus>
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -73,7 +73,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDStopFO.png</texturefocus>
 				<texturenofocus>OSDStopNF.png</texturenofocus>
 				<onleft>603</onleft>
@@ -89,7 +89,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDForwardFO.png</texturefocus>
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
 				<onleft>602</onleft>
@@ -104,7 +104,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDNextTrackFO.png</texturefocus>
 				<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 				<onleft>604</onleft>
@@ -119,7 +119,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 				<onleft>605</onleft>
@@ -138,9 +138,9 @@
 					<top>0</top>
 					<width>40</width>
 					<height>40</height>
-					<label>-</label>
-					<texturefocus>-</texturefocus>
-					<texturenofocus>-</texturenofocus>
+					<label></label>
+					<texturefocus></texturefocus>
+					<texturenofocus></texturenofocus>
 					<onclick>PlayerControl(Repeat)</onclick>
 					<onleft>606</onleft>
 					<onright>608</onright>
@@ -213,7 +213,7 @@
 					<top>0</top>
 					<width>40</width>
 					<height>40</height>
-					<label>-</label>
+					<label></label>
 					<texturefocus>OSDRandomOffFO.png</texturefocus>
 					<texturenofocus>OSDRandomOffNF.png</texturenofocus>
 					<usealttexture>Playlist.IsRandom</usealttexture>
@@ -232,7 +232,7 @@
 					<width>40</width>
 					<height>40</height>
 					<label>31128</label>
-					<font>-</font>
+					<font></font>
 					<texturefocus>OSDLyricsFO.png</texturefocus>
 					<texturenofocus>OSDLyricsNF.png</texturenofocus>
 					<alttexturefocus>OSDLyricsFO.png</alttexturefocus>
@@ -263,7 +263,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDRewindFO.png</texturefocus>
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
 				<onleft>706</onleft>
@@ -280,7 +280,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDStopFO.png</texturefocus>
 				<texturenofocus>OSDStopNF.png</texturenofocus>
 				<onleft>701</onleft>
@@ -296,7 +296,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDPauseFO.png</texturefocus>
 				<texturenofocus>OSDPauseNF.png</texturenofocus>
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -317,7 +317,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDForwardFO.png</texturefocus>
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
 				<onleft>703</onleft>
@@ -334,7 +334,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDChannelUPFO.png</texturefocus>
 				<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 				<onleft>704</onleft>
@@ -349,7 +349,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDChannelDownFO.png</texturefocus>
 				<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 				<onleft>700</onleft>
@@ -364,7 +364,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 				<onleft>705</onleft>
@@ -381,7 +381,7 @@
 				<top>0</top>
 				<width>40</width>
 				<height>40</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>OSDRadioRDSFO.png</texturefocus>
 				<texturenofocus>OSDRadioRDSNF.png</texturenofocus>
 				<onleft>706</onleft>
@@ -418,8 +418,8 @@
 			<top>5</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>back</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
diff --git a/720p/Pointer.xml b/720p/Pointer.xml
index 1ae9479..e47094f 100644
--- a/720p/Pointer.xml
+++ b/720p/Pointer.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol>-</defaultcontrol>
+	<defaultcontrol></defaultcontrol>
 	<coordinates>
 		<left>0</left>
 		<top>0</top>
diff --git a/720p/Settings.xml b/720p/Settings.xml
index f59379d..5d65791 100644
--- a/720p/Settings.xml
+++ b/720p/Settings.xml
@@ -43,8 +43,8 @@
 				<top>11</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -72,7 +72,7 @@
 				<onright>9001</onright>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<scrolltime>300</scrolltime>
 				<itemlayout height="54" width="260">
 					<control type="image">
@@ -119,13 +119,13 @@
 						<label>14200</label>
 						<label2>31430</label2>
 						<onclick>ActivateWindow(PlayerSettings)</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 					<item id="2">
 						<label>14211</label>
 						<label2>31431</label2>
 						<onclick>ActivateWindow(MediaSettings)</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 					<item id="3">
 						<label>14204</label>
@@ -137,25 +137,25 @@
 						<label>24001</label>
 						<label2>31433</label2>
 						<onclick>ActivateWindow(AddonBrowser)</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 					<item id="5">
 						<label>14036</label>
 						<label2>31434</label2>
 						<onclick>ActivateWindow(ServiceSettings)</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 					<item id="6">
 						<label>14206</label>
 						<label2>31436</label2>
 						<onclick>ActivateWindow(InterfaceSettings)</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 					<item id="7">
 						<label>13000</label>
 						<label2>31435</label2>
 						<onclick>ActivateWindow(SystemSettings)</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 				</content>
 			</control>
diff --git a/720p/SettingsCategory.xml b/720p/SettingsCategory.xml
index e51c76f..7994cbd 100644
--- a/720p/SettingsCategory.xml
+++ b/720p/SettingsCategory.xml
@@ -42,8 +42,8 @@
 				<top>11</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -258,7 +258,7 @@
 			<left>0</left>
 			<top>0</top>
 			<height>30</height>
-			<label>-</label>
+			<label></label>
 			<align>center</align>
 			<aligny>bottom</aligny>
 			<font>font13_title</font>
@@ -271,7 +271,7 @@
 			<top>0</top>
 			<width>0</width>
 			<height>0</height>
-			<font>-</font>
+			<font></font>
 			<visible>false</visible>
 		</control>
 		<control type="group">
diff --git a/720p/SettingsProfile.xml b/720p/SettingsProfile.xml
index dfba353..b4824f0 100644
--- a/720p/SettingsProfile.xml
+++ b/720p/SettingsProfile.xml
@@ -43,8 +43,8 @@
 				<top>11</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -72,7 +72,7 @@
 				<onright>9010</onright>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<scrolltime>300</scrolltime>
 				<itemlayout height="54" width="260">
 					<control type="image">
@@ -119,12 +119,12 @@
 					<item id="1">
 						<label>31420</label>
 						<onclick>noop</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 					<item id="2">
 						<label>13200</label>
 						<onclick>noop</onclick>
-						<icon>-</icon>
+						<icon></icon>
 					</item>
 				</content>
 			</control>
diff --git a/720p/SettingsScreenCalibration.xml b/720p/SettingsScreenCalibration.xml
index e5948fa..129a67f 100644
--- a/720p/SettingsScreenCalibration.xml
+++ b/720p/SettingsScreenCalibration.xml
@@ -29,8 +29,8 @@
 			<top>0</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -47,7 +47,7 @@
 			<width>128</width>
 			<height>128</height>
 			<texturefocus>CalibrateTopLeft.png</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturenofocus></texturenofocus>
 		</control>
 		<control type="mover" id="9">
 			<description>right bottom mover</description>
@@ -56,7 +56,7 @@
 			<width>128</width>
 			<height>128</height>
 			<texturefocus>CalibrateBottomRight.png</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturenofocus></texturenofocus>
 		</control>
 		<control type="mover" id="10">
 			<description>subtitle position mover</description>
@@ -65,7 +65,7 @@
 			<width>512</width>
 			<height>128</height>
 			<texturefocus>CalibrateSubtitles.png</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturenofocus></texturenofocus>
 		</control>
 		<control type="resize" id="11">
 			<description>pixel aspect ratio box</description>
@@ -74,7 +74,7 @@
 			<width>256</width>
 			<height>256</height>
 			<texturefocus>CalibratePixelRatio.png</texturefocus>
-			<texturenofocus>-</texturenofocus>
+			<texturenofocus></texturenofocus>
 		</control>
 		<control type="group">
 			<left>20</left>
@@ -84,7 +84,7 @@
 				<left>0</left>
 				<top>10</top>
 				<width>1240</width>
-				<label>-</label>
+				<label></label>
 				<align>center</align>
 				<font>font13</font>
 			</control>
@@ -93,7 +93,7 @@
 				<left>0</left>
 				<top>40</top>
 				<width>1240</width>
-				<label>-</label>
+				<label></label>
 				<align>center</align>
 				<font>font13</font>
 			</control>
diff --git a/720p/SettingsSystemInfo.xml b/720p/SettingsSystemInfo.xml
index 8b1f7f9..2b5cd4a 100644
--- a/720p/SettingsSystemInfo.xml
+++ b/720p/SettingsSystemInfo.xml
@@ -43,8 +43,8 @@
 				<top>11</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -199,7 +199,7 @@
 				<width>726</width>
 				<height>30</height>
 				<font>font16</font>
-				<label>-</label>
+				<label></label>
 				<align>center</align>
 				<aligny>center</aligny>
 				<textcolor>white</textcolor>
@@ -213,7 +213,7 @@
 					<left>0</left>
 					<top>0</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="3">
@@ -221,7 +221,7 @@
 					<left>0</left>
 					<top>35</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="4">
@@ -229,7 +229,7 @@
 					<left>0</left>
 					<top>70</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="5">
@@ -237,7 +237,7 @@
 					<left>0</left>
 					<top>105</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="6">
@@ -245,7 +245,7 @@
 					<left>0</left>
 					<top>140</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="7">
@@ -253,7 +253,7 @@
 					<left>0</left>
 					<top>175</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="8">
@@ -261,7 +261,7 @@
 					<left>0</left>
 					<top>210</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="9">
@@ -269,7 +269,7 @@
 					<left>0</left>
 					<top>245</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="10">
@@ -277,7 +277,7 @@
 					<left>0</left>
 					<top>280</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="label" id="11">
@@ -285,7 +285,7 @@
 					<left>0</left>
 					<top>315</top>
 					<width>750</width>
-					<label>-</label>
+					<label></label>
 					<font>font13</font>
 				</control>
 				<control type="textbox" id="30">
diff --git a/720p/SkinSettings.xml b/720p/SkinSettings.xml
index 2ca499b..2b4fcf6 100644
--- a/720p/SkinSettings.xml
+++ b/720p/SkinSettings.xml
@@ -46,8 +46,8 @@
 				<top>11</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -75,7 +75,7 @@
 				<onright>9010</onright>
 				<onup>9000</onup>
 				<ondown>9000</ondown>
-				<pagecontrol>-</pagecontrol>
+				<pagecontrol></pagecontrol>
 				<scrolltime>300</scrolltime>
 				<itemlayout height="80" width="260">
 					<control type="image">
diff --git a/720p/SlideShow.xml b/720p/SlideShow.xml
index 57e5427..5a0dced 100644
--- a/720p/SlideShow.xml
+++ b/720p/SlideShow.xml
@@ -43,7 +43,7 @@
 			<top>260</top>
 			<width>200</width>
 			<height>200</height>
-			<font>-</font>
+			<font></font>
 			<onclick>play</onclick>
 			<texturefocus>arrow-big-right.png</texturefocus>
 			<texturenofocus>arrow-big-right.png</texturenofocus>
diff --git a/720p/SmartPlaylistRule.xml b/720p/SmartPlaylistRule.xml
index 10cab77..86a6937 100644
--- a/720p/SmartPlaylistRule.xml
+++ b/720p/SmartPlaylistRule.xml
@@ -70,7 +70,7 @@
 			<invalidcolor>invalid</invalidcolor>
 			<texturefocus border="3">button-focus2.png</texturefocus>
 			<texturenofocus border="3">button-nofocus.png</texturenofocus>
-			<label>-</label>
+			<label></label>
 			<hinttext>16028</hinttext>
 			<onup>9001</onup>
 			<onleft>20</onleft>
diff --git a/720p/VideoFullScreen.xml b/720p/VideoFullScreen.xml
index 6721007..a659d38 100644
--- a/720p/VideoFullScreen.xml
+++ b/720p/VideoFullScreen.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<defaultcontrol>-</defaultcontrol>
+	<defaultcontrol></defaultcontrol>
 	<controls>
 		<!-- media infos -->
 		<control type="group" id="1">
diff --git a/720p/VideoOSD.xml b/720p/VideoOSD.xml
index 210513f..2e9169d 100644
--- a/720p/VideoOSD.xml
+++ b/720p/VideoOSD.xml
@@ -15,8 +15,8 @@
 			<top>0</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>Dialog.Close(VideoOSD,true)</onclick>
 			<onclick>FullScreen</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
@@ -52,7 +52,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>210</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDChannelUPFO.png</texturefocus>
 				<texturenofocus>OSDChannelUPNF.png</texturenofocus>
 				<onclick>PlayerControl(Previous)</onclick>
@@ -62,7 +62,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>209</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDChannelDownFO.png</texturefocus>
 				<texturenofocus>OSDChannelDownNF.png</texturenofocus>
 				<onclick>PlayerControl(Next)</onclick>
@@ -72,7 +72,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>210</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDPrevTrackFO.png</texturefocus>
 				<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 				<onclick>PlayerControl(Previous)</onclick>
@@ -82,7 +82,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31354</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRewindFO.png</texturefocus>
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
 				<enable>Player.SeekEnabled</enable>
@@ -97,7 +97,7 @@
 				<height>55</height>
 				<label>31351</label>
 				<altlabel>208</altlabel>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDPauseFO.png</texturefocus>
 				<texturenofocus>OSDPauseNF.png</texturenofocus>
 				<usealttexture>Player.Paused | Player.Forwarding | Player.Rewinding</usealttexture>
@@ -111,7 +111,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31352</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDStopFO.png</texturefocus>
 				<texturenofocus>OSDStopNF.png</texturenofocus>
 				<onclick>PlayerControl(Stop)</onclick>
@@ -120,7 +120,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31353</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDForwardFO.png</texturefocus>
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
 				<enable>Player.SeekEnabled</enable>
@@ -134,7 +134,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>209</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDNextTrackFO.png</texturefocus>
 				<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 				<onclick>PlayerControl(Next)</onclick>
@@ -144,7 +144,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>19019</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDChannelListFO.png</texturefocus>
 				<texturenofocus>OSDChannelListNF.png</texturenofocus>
 				<onclick>ActivateWindow(PVROSDChannels)</onclick>
@@ -155,7 +155,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>$LOCALIZE[19029]$INFO[VideoPlayer.ChannelName, - ]</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDepgFO.png</texturefocus>
 				<texturenofocus>OSDepgNF.png</texturenofocus>
 				<onclick>ActivateWindow(PVROSDGuide)</onclick>
@@ -166,7 +166,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31356</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDTeleTextFO.png</texturefocus>
 				<texturenofocus>OSDTeleTextNF.png</texturenofocus>
 				<onclick>ActivateWindow(Teletext)</onclick>
@@ -174,17 +174,17 @@
 			</control>
 			<control type="image" id="2200">
 				<width>270</width>
-				<texture>-</texture>
+				<texture></texture>
 				<visible>VideoPlayer.HasMenu + !VideoPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="image" id="2300">
 				<width>160</width>
-				<texture>-</texture>
+				<texture></texture>
 				<visible>VideoPlayer.Content(LiveTV)</visible>
 			</control>
 			<control type="image" id="2600">
 				<width>325</width>
-				<texture>-</texture>
+				<texture></texture>
 				<visible>!VideoPlayer.Content(LiveTV) + !VideoPlayer.HasMenu</visible>
 			</control>
 			<control type="button" id="255">
@@ -193,7 +193,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>36501</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDStereoscopicFO.png</texturefocus>
 				<texturenofocus>OSDStereoscopicNF.png</texturenofocus>
 				<onup>501</onup>
@@ -202,7 +202,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31356</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDSubtitlesFO.png</texturefocus>
 				<texturenofocus>OSDSubtitlesNF.png</texturenofocus>
 				<onup>404</onup>
@@ -211,7 +211,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>13395</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDVideoFO.png</texturefocus>
 				<texturenofocus>OSDVideoNF.png</texturenofocus>
 				<onclick>ActivateWindow(OSDVideoSettings)</onclick>
@@ -220,7 +220,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>13396</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDAudioFO.png</texturefocus>
 				<texturenofocus>OSDAudioNF.png</texturenofocus>
 				<usealttexture>system.getbool(audiooutput.dspaddonsenabled)</usealttexture>
@@ -232,7 +232,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>298</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDBookmarksFO.png</texturefocus>
 				<texturenofocus>OSDBookmarksNF.png</texturenofocus>
 				<onclick>ActivateWindow(VideoBookmarks)</onclick>
@@ -242,7 +242,7 @@
 				<width>55</width>
 				<height>55</height>
 				<label>31355</label>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDDvdFO.png</texturefocus>
 				<texturenofocus>OSDDvdNF.png</texturenofocus>
 				<onclick>PlayerControl(ShowVideoMenu)</onclick>
@@ -253,7 +253,7 @@
 				<height>55</height>
 				<label>264</label>
 				<altlabel>265</altlabel>
-				<font>-</font>
+				<font></font>
 				<texturefocus>OSDRecordOffFO.png</texturefocus>
 				<texturenofocus>OSDRecordOffNF.png</texturenofocus>
 				<usealttexture>Player.Recording</usealttexture>
@@ -271,10 +271,10 @@
 			<bottom>60</bottom>
 			<width>256</width>
 			<height>250</height>
-			<label>-</label>
-			<font>-</font>
-			<texturenofocus>-</texturenofocus>
-			<texturefocus>-</texturefocus>
+			<label></label>
+			<font></font>
+			<texturenofocus></texturenofocus>
+			<texturefocus></texturefocus>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
 			<visible>Control.HasFocus(410) | Control.HasFocus(250) | ControlGroup(400).HasFocus</visible>
 		</control>
@@ -394,10 +394,10 @@
 			<bottom>60</bottom>
 			<width>256</width>
 			<height>210</height>
-			<label>-</label>
-			<font>-</font>
-			<texturenofocus>-</texturenofocus>
-			<texturefocus>-</texturefocus>
+			<label></label>
+			<font></font>
+			<texturenofocus></texturenofocus>
+			<texturefocus></texturefocus>
 			<animation effect="slide" start="0,0" end="55,0" time="0" condition="VideoPlayer.Content(LiveTV)">Conditional</animation>
 			<visible>Control.HasFocus(520) | Control.HasFocus(255) | ControlGroup(500).HasFocus</visible>
 		</control>
diff --git a/720p/VideoOSDBookmarks.xml b/720p/VideoOSDBookmarks.xml
index 9c4db1d..8a58e78 100644
--- a/720p/VideoOSDBookmarks.xml
+++ b/720p/VideoOSDBookmarks.xml
@@ -42,8 +42,8 @@
 			<top>15</top>
 			<width>64</width>
 			<height>32</height>
-			<label>-</label>
-			<font>-</font>
+			<label></label>
+			<font></font>
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -77,7 +77,7 @@
 			<onup>2</onup>
 			<scrolltime>200</scrolltime>
 			<viewtype label="536">icon</viewtype>
-			<pagecontrol>-</pagecontrol>
+			<pagecontrol></pagecontrol>
 			<orientation>vertical</orientation>
 			<itemlayout height="215" width="240">
 				<control type="image">
diff --git a/720p/ViewsMusicLibrary.xml b/720p/ViewsMusicLibrary.xml
index 64bf4b9..adaccb8 100644
--- a/720p/ViewsMusicLibrary.xml
+++ b/720p/ViewsMusicLibrary.xml
@@ -492,7 +492,7 @@
 					<height>144</height>
 					<font>font13</font>
 					<align>justify</align>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<textcolor>white</textcolor>
 					<label>$INFO[ListItem.Property(Album_Description)]</label>
 					<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
@@ -1086,7 +1086,7 @@
 					<height>298</height>
 					<font>font13</font>
 					<align>justify</align>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<textcolor>white</textcolor>
 					<label>$INFO[ListItem.Property(Album_Description)]</label>
 					<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
diff --git a/720p/ViewsPVRGuide.xml b/720p/ViewsPVRGuide.xml
index a83e409..d321908 100644
--- a/720p/ViewsPVRGuide.xml
+++ b/720p/ViewsPVRGuide.xml
@@ -550,7 +550,7 @@
 							<align>justify</align>
 							<textcolor>grey2</textcolor>
 							<shadowcolor>black</shadowcolor>
-							<pagecontrol>-</pagecontrol>
+							<pagecontrol></pagecontrol>
 							<label>$INFO[ListItem.Plot]</label>
 						</control>
 						<control type="image">
@@ -883,7 +883,7 @@
 							<align>justify</align>
 							<textcolor>grey2</textcolor>
 							<shadowcolor>black</shadowcolor>
-							<pagecontrol>-</pagecontrol>
+							<pagecontrol></pagecontrol>
 							<label>$INFO[ListItem.Plot]</label>
 						</control>
 						<control type="image">
@@ -1163,7 +1163,7 @@
 							<align>justify</align>
 							<textcolor>grey2</textcolor>
 							<shadowcolor>black</shadowcolor>
-							<pagecontrol>-</pagecontrol>
+							<pagecontrol></pagecontrol>
 							<label>$INFO[ListItem.Plot]</label>
 						</control>
 						<control type="image">
diff --git a/720p/ViewsWeather.xml b/720p/ViewsWeather.xml
index 0720e80..901f997 100644
--- a/720p/ViewsWeather.xml
+++ b/720p/ViewsWeather.xml
@@ -287,8 +287,8 @@
 				</focusedlayout>
 				<content>
 					<item>
-						<label>-</label>
-						<icon>-</icon>
+						<label></label>
+						<icon></icon>
 						<onclick>noop</onclick>
 						<visible>!Weather.IsFetched</visible>
 					</item>
@@ -442,8 +442,8 @@
 				<top>-20</top>
 				<width>1</width>
 				<height>1</height>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
+				<texturenofocus></texturenofocus>
+				<texturefocus></texturefocus>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
 			</control>
@@ -664,8 +664,8 @@
 				<top>-20</top>
 				<width>1</width>
 				<height>1</height>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
+				<texturenofocus></texturenofocus>
+				<texturefocus></texturefocus>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
 			</control>
@@ -1146,7 +1146,7 @@
 				<top>565</top>
 				<width>25</width>
 				<height>25</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>scroll-right-focus.png</texturefocus>
 				<texturenofocus>scroll-right.png</texturenofocus>
 				<onleft>991</onleft>
@@ -1158,7 +1158,7 @@
 				<top>565</top>
 				<width>25</width>
 				<height>25</height>
-				<label>-</label>
+				<label></label>
 				<texturefocus>scroll-left-focus.png</texturefocus>
 				<texturenofocus>scroll-left.png</texturenofocus>
 				<onleft>9000</onleft>
@@ -1287,8 +1287,8 @@
 				<top>-20</top>
 				<width>1</width>
 				<height>1</height>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
+				<texturenofocus></texturenofocus>
+				<texturefocus></texturefocus>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
 			</control>
diff --git a/720p/script-cu-lrclyrics-main.xml b/720p/script-cu-lrclyrics-main.xml
index 06f29d3..22959ff 100644
--- a/720p/script-cu-lrclyrics-main.xml
+++ b/720p/script-cu-lrclyrics-main.xml
@@ -31,8 +31,8 @@
 				<top>15</top>
 				<width>64</width>
 				<height>32</height>
-				<label>-</label>
-				<font>-</font>
+				<label></label>
+				<font></font>
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -138,7 +138,7 @@
 				<left>570</left>
 				<top>420</top>
 				<subtype>page</subtype>
-				<font>-</font>
+				<font></font>
 				<onleft>110</onleft>
 				<onright>110</onright>
 				<ondown>110</ondown>
@@ -225,7 +225,7 @@
 				<left>570</left>
 				<top>420</top>
 				<subtype>page</subtype>
-				<font>-</font>
+				<font></font>
 				<onleft>120</onleft>
 				<onright>120</onright>
 				<ondown>120</ondown>
diff --git a/720p/script-globalsearch-main.xml b/720p/script-globalsearch-main.xml
index dfc3ec4..651af71 100644
--- a/720p/script-globalsearch-main.xml
+++ b/720p/script-globalsearch-main.xml
@@ -144,8 +144,8 @@
 					<top>11</top>
 					<width>64</width>
 					<height>32</height>
-					<label>-</label>
-					<font>-</font>
+					<label></label>
+					<font></font>
 					<onclick>PreviousMenu</onclick>
 					<texturefocus>DialogCloseButton-focus.png</texturefocus>
 					<texturenofocus>DialogCloseButton.png</texturenofocus>
@@ -173,7 +173,7 @@
 					<onright>101</onright>
 					<onup>9000</onup>
 					<ondown>9000</ondown>
-					<pagecontrol>-</pagecontrol>
+					<pagecontrol></pagecontrol>
 					<scrolltime>300</scrolltime>
 					<itemlayout height="60" width="260">
 						<control type="image">
@@ -362,9 +362,9 @@
 					<top>2000</top>
 					<width>100</width>
 					<height>0</height>
-					<label>-</label>
-					<font>-</font>
-					<textcolor>-</textcolor>
+					<label></label>
+					<font></font>
+					<textcolor></textcolor>
 				</control>
 				<control type="label" id="191">
 					<!-- Hide this Control off the screen because we use the label above instead -->
@@ -372,8 +372,8 @@
 					<top>2000</top>
 					<width>100</width>
 					<height>0</height>
-					<label>-</label>
-					<font>-</font>
+					<label></label>
+					<font></font>
 				</control>
 				<control type="label" id="199">
 					<left>40</left>
@@ -404,7 +404,7 @@
 					<top>2000</top>
 					<width>10</width>
 					<height>10</height>
-					<label>-</label>
+					<label></label>
 					<font>font10</font>
 					<textcolor>white</textcolor>
 					<align>center</align>
@@ -429,9 +429,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="221">
 							<visible>Container(9000).HasFocus(1)</visible>
@@ -582,9 +582,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="111">
 							<visible>Container(9000).HasFocus(2)</visible>
@@ -815,9 +815,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="211">
 							<visible>Container(9000).HasFocus(3)</visible>
@@ -1050,9 +1050,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="121">
 							<visible>Container(9000).HasFocus(4)</visible>
@@ -1225,9 +1225,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="131">
 							<visible>Container(9000).HasFocus(5)</visible>
@@ -1358,9 +1358,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="141">
 							<visible>Container(9000).HasFocus(6)</visible>
@@ -1526,9 +1526,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="151">
 							<visible>Container(9000).HasFocus(7)</visible>
@@ -1717,9 +1717,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="161">
 							<visible>Container(9000).HasFocus(8)</visible>
@@ -1870,9 +1870,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="171">
 							<visible>Container(9000).HasFocus(9)</visible>
@@ -2023,9 +2023,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="181">
 							<visible>Container(9000).HasFocus(10)</visible>
@@ -2198,9 +2198,9 @@
 							<top>2000</top>
 							<width>100</width>
 							<height>0</height>
-							<label>-</label>
-							<font>-</font>
-							<textcolor>-</textcolor>
+							<label></label>
+							<font></font>
+							<textcolor></textcolor>
 						</control>
 						<control type="panel" id="231">
 							<visible>Container(9000).Hasfocus(11)</visible>