--- a/skin.pm3-hd/720p/Home.xml
+++ b/skin.pm3-hd/720p/Home.xml
@@ -38,7 +38,7 @@
 		<control type="group">
 			<posx>600r</posx>
 			<posy>450</posy>
-			<visible>Container(9000).HasFocus(5) + Weather.IsFetched + !Skin.HasSetting(homepageWeatherinfo)</visible>
+			<visible>Container(9000).HasFocus(5) + Weather.IsFetched + !Skin.HasSetting(homepageWeatherinfo) + !IsEmpty(Weather.Plugin)</visible>
 			<include>homestatsinfo</include>
 			<control type="image">
 				<description>gradient</description>
@@ -82,7 +82,7 @@
 				<posy>37</posy>
 				<height>30</height>
 				<width>500</width>
-				<label>$INFO[Weather.Location]</label>
+				<label>$INFO[Window(Weather).Property(Location)]</label>
 				<align>right</align>
 				<aligny>center</aligny>
 				<font>font18</font>
@@ -94,7 +94,7 @@
 				<posy>70</posy>
 				<height>30</height>
 				<width>500</width>
-				<label>$INFO[Weather.Conditions]</label>
+				<label>$INFO[Window(Weather).Property(Current.Condition)]</label>
 				<align>right</align>
 				<aligny>center</aligny>
 				<font>font12</font>
@@ -106,11 +106,12 @@
 				<posy>95</posy>
 				<height>30</height>
 				<width>500</width>
-				<label>$LOCALIZE[143] $INFO[Weather.Temperature]</label>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font12</font>
-				<shadowcolor>black</shadowcolor>
+				<label>$LOCALIZE[143] $INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label>
+				<align>right</align>
+				<aligny>center</aligny>
+				<font>font12</font>
+				<shadowcolor>black</shadowcolor>
+				<visible>!IsEmpty(Window(Weather).Property(Current.Temperature))</visible>
 			</control>
 		</control>
 		<!-- Music Info -->
@@ -481,7 +482,7 @@
 						<onclick>ActivateWindow(Weather)</onclick>
 						<icon>special://skin/backgrounds/weather.jpg</icon>
 						<thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
-						<visible>!Skin.HasSetting(homepageHideWeatherButton)</visible>
+						<visible>!Skin.HasSetting(homepageHideWeatherButton) + !IsEmpty(Weather.Plugin)</visible>
 					</item>
 					<item id="7">
 						<label>5</label>
@@ -502,8 +503,8 @@
 		<control type="image">
 			<posx>40</posx>
 			<posy>30</posy>
-			<width>460</width>
-			<height>65</height>
+			<width>440</width>
+			<height>60</height>
 			<texture>xbmc-logo.png</texture>
 			<include>Window_OpenClose_Animation</include>
 		</control>