Index: scripts/.modules/script.module.weather/lib/xbmcweather/search.py
===================================================================
--- scripts/.modules/script.module.weather/lib/xbmcweather/search.py	(revision 30775)
+++ scripts/.modules/script.module.weather/lib/xbmcweather/search.py	(working copy)
@@ -19,7 +19,7 @@
     # base urls
     BASE_URLS = {
         "geo": "http://www.dnsstuff.com/tools/ipall/",
-        "weather": "http://xoap.weather.com/weather/local/%s?cc=*&unit=e&dayf=5&prod=xoap&link=xoap&par=%s&key=%s",
+        "weather": "http://xoap.weather.com/weather/local/%s?cc=*&dayf=5&link=xoap&prod=xoap&unit=s&par=%s&key=%s",
         "search": "http://xoap.weather.com/search/search?where=%s"
     }
     # set headers
Index: scripts/.modules/script.module.weather/lib/xbmcweather/weather.py
===================================================================
--- scripts/.modules/script.module.weather/lib/xbmcweather/weather.py	(revision 30775)
+++ scripts/.modules/script.module.weather/lib/xbmcweather/weather.py	(working copy)
@@ -20,7 +20,7 @@
     PARTNER_KEY = "079f24145f208494"
     # base url
     BASE_URLS = {
-        "weather": "http://xoap.weather.com/weather/local/%s?cc=*&unit=e&dayf=5&prod=xoap&link=xoap&par=%s&key=%s"
+        "weather": "http://xoap.weather.com/weather/local/%s?cc=*&dayf=5&link=xoap&prod=xoap&unit=s&par=%s&key=%s"
     }
     # set headers
     HEADERS = {
@@ -30,7 +30,7 @@
     # weather window for setting weather properties
     WINDOW = xbmcgui.Window( 12600 )
     # set refresh time in minutes
-    REFRESH_TIME = 20
+    REFRESH_TIME = 25
 
     def __init__( self, addon, index, refresh, localize ):
         # set our Addon class
@@ -98,6 +98,9 @@
             # parse info
             info = self._parse_source( xml )
         except:
+            # remove source
+            if ( os.path.isfile( self.base_path ) ):
+                os.remove( xbmc.translatePath( self.base_path ) )
             # set error message and clear info
             msg = "error"
             info = self._clear_info()
Index: xbmc/utils/Weather.cpp
===================================================================
--- xbmc/utils/Weather.cpp	(revision 30775)
+++ xbmc/utils/Weather.cpp	(working copy)
@@ -52,8 +52,8 @@
 }
 
 DWORD CWeather::TimeToNextRefreshInMs()
-{ // 10 minutes
-  return 10 * 60 * 1000;
+{ // 15 minutes
+  return 15 * 60 * 1000;
 }
 
 char *CWeather::GetLocation(int iLocation)