diff --git a/720p/Home.xml b/720p/Home.xml
index 1f5826d..f350081 100644
--- a/720p/Home.xml
+++ b/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>
+				<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>
diff --git a/720p/MyWeather.xml b/720p/MyWeather.xml
index 741f710..9d303c5 100644
--- a/720p/MyWeather.xml
+++ b/720p/MyWeather.xml
@@ -48,6 +48,19 @@
 					<colordiffuse>66FFFFFF</colordiffuse>
 					<texture>black-back.png</texture>
 				</control>
+				<control type="label">
+					<description>Provider Text</description>
+					<posx>20</posx>
+					<posy>40</posy>
+					<width>440</width>
+					<height>25</height>
+					<font>font11</font>
+					<textcolor>white</textcolor>
+					<scroll>true</scroll>
+					<align>center</align>
+					<aligny>center</aligny>
+					<label>$LOCALIZE[31007] : [COLOR=green]$INFO[Window.Property(WeatherProvider)][/COLOR]</label>
+				</control>
 				<control type="label">
 					<description>current temp Value</description>
 					<posx>20</posx>
@@ -718,7 +731,7 @@
 			<scroll>false</scroll>
 			<align>right</align>
 			<aligny>center</aligny>
-			<info>Weather.Location</info>
+			<label>$INFO[Window(Weather).Property(Location)]</label>
 			<include>Window_OpenClose_Animation</include>
 		</control>
 		<include>WindowTitleButtons</include>
diff --git a/language/English/strings.xml b/language/English/strings.xml
index 2629b1d..b8bb078 100644
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -7,7 +7,7 @@
   <string id="31004">Home</string>
   <string id="31005">Memory Used:</string>
   <string id="31006">End Time:</string>
-  <string id="31007"></string>
+  <string id="31007">Data Provider</string>
   <string id="31008"></string>
   <string id="31009"></string>
   <string id="31010">FANART[CR]IMAGE[CR]NOT[CR]AVAILABLE</string>