diff --git a/1080i/Includes_Variables.xml b/1080i/Includes_Variables.xml
index 5d1f4102..8cb6dfdf 100644
--- a/1080i/Includes_Variables.xml
+++ b/1080i/Includes_Variables.xml
@@ -160,6 +160,14 @@
         <value condition="!IsEmpty(ListItem.Plot)">$INFO[ListItem.Plot]</value>
         <value>$LOCALIZE[416]</value>
     </variable>
+    <variable name="WeatherFanartPath">
+        <value condition="!IsEmpty(Skin.String(weatherArtPath))">$INFO[Skin.String(weatherArtPath)]</value>
+        <value>special://skin/backgrounds/weather/</value>
+    </variable>
+    <variable name="WeatherIconPath">
+        <value condition="!IsEmpty(Skin.String(weatherIconPath))">$INFO[Skin.String(weatherIconPath)]</value>
+        <value>weather/</value>
+    </variable>
     <variable name="Default.Art">
         <value condition="!IsEmpty(Skin.String(Default.Background))">$INFO[Skin.String(Default.Background)]</value>
         <value condition="Skin.HasSetting(BlackGlassMode)">special://skin/backgrounds/default/default2.jpg</value>
@@ -215,10 +223,10 @@
         <value>special://skin/backgrounds/Settings.jpg</value>
     </variable>
     <variable name="Weather.Art">
-        <value condition="!IsEmpty(Weather.fanartcode)">$INFO[Weather.fanartcode,special://skin/backgrounds/weather/,.jpg]</value>
+        <value condition="!IsEmpty(Weather.fanartcode)">$VAR[WeatherFanartPath]$INFO[Weather.fanartcode].jpg</value>
         <value condition="!IsEmpty(Skin.String(Weather.Background))">$INFO[Skin.String(Weather.Background)]</value>
         <value>special://skin/backgrounds/Weather.jpg</value>
-    </variable> -->
+    </variable>
     <variable name="Tv.Art">
         <value condition="!IsEmpty(Skin.String(Tv.Background))">$INFO[Skin.String(Tv.Background)]</value>
         <value>special://skin/backgrounds/Tv.jpg</value>
@@ -258,7 +266,7 @@
         <value condition="StringCompare(Container(300).ListItem.Property(background),tvshowFanart)">$INFO[Window(Home).Property(script.grab.fanart.TV.FanArt)]</value>
         <value condition="StringCompare(Container(300).ListItem.Property(background),videoFanart)">$INFO[Window(Home).Property(script.grab.fanart.Video.FanArt)]</value>
         <value condition="StringCompare(Container(300).ListItem.Property(background),musicFanart)">$INFO[Window(Home).Property(script.grab.fanart.Music.FanArt)]</value>
-        <value condition="StringCompare(Container(300).ListItem.Property(background),weatherFanart)">$INFO[Weather.fanartcode,special://skin/backgrounds/weather/,.jpg]</value>
+        <value condition="StringCompare(Container(300).ListItem.Property(background),weatherFanart)">$VAR[WeatherFanartPath]$INFO[Weather.fanartcode].jpg</value>
         <value condition="StringCompare(Container(300).ListItem.Property(Background),Videos.Art)">$VAR[Videos.Art]</value>
         <value condition="StringCompare(Container(300).ListItem.Property(Background),Movies.Art)">$VAR[Movies.Art]</value>
         <value condition="StringCompare(Container(300).ListItem.Property(Background),Pictures.Art)">$VAR[Pictures.Art]</value>
@@ -285,7 +293,7 @@
         <value condition="StringCompare(Container(211).ListItem.Property(background),tvshowFanart)">$INFO[Window(Home).Property(script.grab.fanart.TV.FanArt)]</value>
         <value condition="StringCompare(Container(211).ListItem.Property(background),videoFanart)">$INFO[Window(Home).Property(script.grab.fanart.Video.FanArt)]</value>
         <value condition="StringCompare(Container(211).ListItem.Property(background),musicFanart)">$INFO[Window(Home).Property(script.grab.fanart.Music.FanArt)]</value>
-        <value condition="StringCompare(Container(211).ListItem.Property(background),weatherFanart)">$INFO[Weather.fanartcode,special://skin/backgrounds/weather/,.jpg]</value>
+        <value condition="StringCompare(Container(211).ListItem.Property(background),weatherFanart)">$VAR[WeatherFanartPath]$INFO[Weather.fanartcode].jpg</value>
         <value condition="StringCompare(Container(211).ListItem.Property(Background),Videos.Art)">$VAR[Videos.Art]</value>
         <value condition="StringCompare(Container(211).ListItem.Property(Background),Movies.Art)">$VAR[Movies.Art]</value>
         <value condition="StringCompare(Container(211).ListItem.Property(Background),Pictures.Art)">$VAR[Pictures.Art]</value>
diff --git a/1080i/Includes_Weather.xml b/1080i/Includes_Weather.xml
index 99e796cb..f37f44c0 100644
--- a/1080i/Includes_Weather.xml
+++ b/1080i/Includes_Weather.xml
@@ -14,8 +14,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$LOCALIZE[33006]</label>
-                <thumb>$INFO[Window(Weather).Property(Current.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Current.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Current.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Current.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day0.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day0.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Current.Condition)]</property>
@@ -33,8 +33,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day1.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$LOCALIZE[33007]</label>
-                <thumb>$INFO[Window(Weather).Property(Day1.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Day1.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Day1.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Day1.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day1.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day1.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Day1.Outlook)]</property>
@@ -44,8 +44,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day2.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window.Property(Day2.Title)]</label>
-                <thumb>$INFO[Window(Weather).Property(Day2.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Day2.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Day2.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Day2.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day2.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day2.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Day2.Outlook)]</property>
@@ -55,8 +55,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day3.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window.Property(Day3.Title)]</label>
-                <thumb>$INFO[Window(Weather).Property(Day3.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Day3.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Day3.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Day3.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day3.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day3.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Day3.Outlook)]</property>
@@ -66,8 +66,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day4.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window.Property(Day4.Title)]</label>
-                <thumb>$INFO[Window(Weather).Property(Day4.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Day4.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Day4.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Day4.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day4.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day4.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Day4.Outlook)]</property>
@@ -77,8 +77,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day5.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Day5.Title)]</label>
-                <thumb>$INFO[Window(Weather).Property(Day5.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Day5.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Day5.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Day5.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day5.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day5.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Day5.Outlook)]</property>
@@ -88,8 +88,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Day6.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Day6.Title)]</label>
-                <thumb>$INFO[Window(Weather).Property(Day6.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Day6.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Day6.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Day6.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Day6.HighTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property2">$INFO[Window.Property(Day6.LowTemp)]$INFO[System.TemperatureUnits]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Day6.Outlook)]</property>
@@ -100,8 +100,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.1.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.1.ShortDay)] $INFO[Window.Property(Daily.1.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.1.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.1.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.1.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.1.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.1.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.1.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.1.Outlook)]</property>
@@ -119,8 +119,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.2.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.2.ShortDay)] $INFO[Window.Property(Daily.2.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.2.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.2.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.2.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.2.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.2.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.2.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.2.Outlook)]</property>
@@ -134,8 +134,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.3.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.3.ShortDay)] $INFO[Window.Property(Daily.3.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.3.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.3.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.3.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.3.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.3.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.3.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.3.Outlook)]</property>
@@ -149,8 +149,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.4.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.4.ShortDay)] $INFO[Window.Property(Daily.4.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.4.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.4.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.4.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.4.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.4.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.4.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.4.Outlook)]</property>
@@ -164,8 +164,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.5.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.5.ShortDay)] $INFO[Window.Property(Daily.5.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.5.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.5.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.5.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.5.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.5.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.5.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.5.Outlook)]</property>
@@ -178,8 +178,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.6.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.6.ShortDay)] $INFO[Window.Property(Daily.6.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.6.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.6.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.6.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.6.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.6.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.6.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.6.Outlook)]</property>
@@ -192,8 +192,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.7.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.7.ShortDay)] $INFO[Window.Property(Daily.7.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.7.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.7.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.7.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.7.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.7.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.7.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.7.Outlook)]</property>
@@ -206,8 +206,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.8.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.8.ShortDay)] $INFO[Window.Property(Daily.8.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.8.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.8.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.8.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.8.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.8.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.8.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.8.Outlook)]</property>
@@ -220,8 +220,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.9.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.9.ShortDay)] $INFO[Window.Property(Daily.9.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.9.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.9.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.9.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.9.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.9.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.9.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.9.Outlook)]</property>
@@ -234,8 +234,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.10.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.10.ShortDay)] $INFO[Window.Property(Daily.10.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.10.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.10.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.10.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.10.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.10.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.10.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.10.Outlook)]</property>
@@ -248,8 +248,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.11.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.11.ShortDay)] $INFO[Window.Property(Daily.11.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.11.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.11.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.11.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.11.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.11.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.11.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.11.Outlook)]</property>
@@ -262,8 +262,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.12.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.12.ShortDay)] $INFO[Window.Property(Daily.12.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.12.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.12.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.12.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.12.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.12.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.12.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.12.Outlook)]</property>
@@ -276,8 +276,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.13.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.13.ShortDay)] $INFO[Window.Property(Daily.13.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.13.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.13.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.13.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.13.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.13.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.13.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.13.Outlook)]</property>
@@ -290,8 +290,8 @@
                 <visible>Skin.String(WeatherType,)|Skin.String(WeatherType,daily)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.14.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Daily.14.ShortDay)] $INFO[Window.Property(Daily.14.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Daily.14.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Daily.14.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Daily.14.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Daily.14.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Daily.14.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Daily.14.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Daily.14.Outlook)]</property>
@@ -305,8 +305,8 @@
                 <visible>Skin.String(WeatherType,36Hour)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(36Hour.1.Outlook)) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible>
                 <label>$INFO[Window.Property(36Hour.1.Heading)]</label>
-                <thumb>$INFO[Window(Weather).Property(36Hour.1.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(36Hour.1.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(36Hour.1.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(36Hour.1.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(36Hour.1.TemperatureHeading)]: $INFO[Window.Property(36Hour.1.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(36Hour.1.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(36Hour.1.Outlook)]</property>
@@ -320,8 +320,8 @@
                 <visible>Skin.String(WeatherType,36Hour)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(36Hour.2.Outlook)) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible>
                 <label>$INFO[Window.Property(36Hour.2.Heading)]</label>
-                <thumb>$INFO[Window(Weather).Property(36Hour.2.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(36Hour.2.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(36Hour.2.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(36Hour.2.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(36Hour.2.TemperatureHeading)]: $INFO[Window.Property(36Hour.2.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(36Hour.2.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(36Hour.2.Outlook)]</property>
@@ -335,8 +335,8 @@
                 <visible>Skin.String(WeatherType,36Hour)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(36Hour.3.Outlook)) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible>
                 <label>$INFO[Window.Property(36Hour.3.Heading)]</label>
-                <thumb>$INFO[Window(Weather).Property(36Hour.3.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(36Hour.3.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(36Hour.3.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(36Hour.3.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(36Hour.3.TemperatureHeading)]: $INFO[Window.Property(36Hour.3.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(36Hour.3.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(36Hour.3.Outlook)]</property>
@@ -351,8 +351,8 @@
                 <visible>Skin.String(WeatherType,Weekend)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Weekend.1.Outlook)) + !IsEmpty(Window.Property(Weekend.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Weekend.1.ShortDay)] $INFO[Window.Property(Weekend.1.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Weekend.1.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Weekend.1.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Weekend.1.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Weekend.1.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Weekend.1.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Weekend.1.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Weekend.1.Outlook)]</property>
@@ -366,8 +366,8 @@
                 <visible>Skin.String(WeatherType,Weekend)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Weekend.2.Outlook)) + !IsEmpty(Window.Property(Weekend.IsFetched))</visible>
                 <label>$INFO[Window(Weather).Property(Weekend.2.ShortDay)] $INFO[Window.Property(Weekend.2.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Weekend.2.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Weekend.2.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Weekend.2.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Weekend.2.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Weekend.2.HighTemperature)]</property>
                 <property name="Property2">$INFO[Window.Property(Weekend.2.LowTemperature)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Weekend.2.Outlook)]</property>
@@ -382,8 +382,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.1.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.1.Time)] - $INFO[Window.Property(Hourly.1.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.1.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.1.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.1.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.1.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.1.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.1.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.1.Outlook)]</property>
@@ -397,8 +397,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.2.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.2.Time)] - $INFO[Window.Property(Hourly.2.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.2.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.2.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.2.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.2.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.2.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.2.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.2.Outlook)]</property>
@@ -412,8 +412,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.3.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.3.Time)] - $INFO[Window.Property(Hourly.3.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.3.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.3.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.3.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.3.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.3.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.3.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.3.Outlook)]</property>
@@ -427,8 +427,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.4.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.4.Time)] - $INFO[Window.Property(Hourly.4.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.4.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.4.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.4.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.4.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.4.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.4.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.4.Outlook)]</property>
@@ -442,8 +442,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.5.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.5.Time)] - $INFO[Window.Property(Hourly.5.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.5.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.5.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.5.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.5.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.5.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.5.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.5.Outlook)]</property>
@@ -457,8 +457,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.6.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.6.Time)] - $INFO[Window.Property(Hourly.6.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.6.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.6.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.6.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.6.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.6.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.6.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.6.Outlook)]</property>
@@ -472,8 +472,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.7.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.7.Time)] - $INFO[Window.Property(Hourly.7.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.7.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.7.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.7.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.7.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.7.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.7.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.7.Outlook)]</property>
@@ -487,8 +487,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.8.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.8.Time)] - $INFO[Window.Property(Hourly.8.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.8.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.8.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.8.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.8.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.8.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.8.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.8.Outlook)]</property>
@@ -502,8 +502,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.9.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.9.Time)] - $INFO[Window.Property(Hourly.9.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.9.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.9.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.9.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.9.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.9.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.9.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.9.Outlook)]</property>
@@ -517,8 +517,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.10.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.10.Time)] - $INFO[Window.Property(Hourly.10.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.10.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.10.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.10.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.10.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.10.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.10.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.10.Outlook)]</property>
@@ -532,8 +532,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.11.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.11.Time)] - $INFO[Window.Property(Hourly.11.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.11.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.11.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.11.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.11.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.11.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.11.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.11.Outlook)]</property>
@@ -547,8 +547,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.12.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.12.Time)] - $INFO[Window.Property(Hourly.12.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.12.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.12.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.12.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.12.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.12.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.12.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.12.Outlook)]</property>
@@ -562,8 +562,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.13.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.13.Time)] - $INFO[Window.Property(Hourly.13.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.13.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.13.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.13.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.13.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.13.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.13.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.13.Outlook)]</property>
@@ -577,8 +577,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.14.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.14.Time)] - $INFO[Window.Property(Hourly.14.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.14.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.14.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.14.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.14.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.14.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.14.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.14.Outlook)]</property>
@@ -592,8 +592,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.15.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.15.Time)] - $INFO[Window.Property(Hourly.15.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.15.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.15.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.15.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.15.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.15.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.15.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.15.Outlook)]</property>
@@ -607,8 +607,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.16.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.16.Time)] - $INFO[Window.Property(Hourly.16.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.16.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.16.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.16.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.16.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.16.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.16.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.16.Outlook)]</property>
@@ -622,8 +622,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.17.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.17.Time)] - $INFO[Window.Property(Hourly.17.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.17.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.17.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.17.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.17.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.17.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.17.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.17.Outlook)]</property>
@@ -637,8 +637,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.18.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.18.Time)] - $INFO[Window.Property(Hourly.18.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.18.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.18.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.18.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.18.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.18.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.18.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.18.Outlook)]</property>
@@ -652,8 +652,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.19.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.19.Time)] - $INFO[Window.Property(Hourly.19.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.19.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.19.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.19.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.19.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.19.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.19.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.19.Outlook)]</property>
@@ -667,8 +667,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.20.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.20.Time)] - $INFO[Window.Property(Hourly.20.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.20.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.20.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.20.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.20.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.20.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.20.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.20.Outlook)]</property>
@@ -682,8 +682,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.21.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.21.Time)] - $INFO[Window.Property(Hourly.21.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.21.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.21.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.21.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.21.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.21.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.21.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.21.Outlook)]</property>
@@ -697,8 +697,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.22.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.22.Time)] - $INFO[Window.Property(Hourly.22.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.22.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.22.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.22.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.22.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.22.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.22.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.22.Outlook)]</property>
@@ -712,8 +712,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.23.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.23.Time)] - $INFO[Window.Property(Hourly.23.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.23.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.23.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.23.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.23.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.23.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.23.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.23.Outlook)]</property>
@@ -727,8 +727,8 @@
                 <visible>Skin.String(WeatherType,Hourly)</visible>
                 <visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.24.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
                 <label>$INFO[Window.Property(Hourly.24.Time)] - $INFO[Window.Property(Hourly.24.ShortDate)]</label>
-                <thumb>$INFO[Window(Weather).Property(Hourly.24.FanartCode),special://skin/backgrounds/weather/,.jpg]</thumb>
-                <property name="Icon">$INFO[Window(Weather).Property(Hourly.24.FanartCode),weather/,.png]</property>
+                <thumb>$VAR[WeatherFanartPath]$INFO[Window(Weather).Property(Hourly.24.FanartCode)].jpg</thumb>
+                <property name="Icon">$VAR[WeatherIconPath]$INFO[Window(Weather).Property(Hourly.24.FanartCode)].png</property>
                 <property name="Property1">$INFO[Window.Property(Hourly.24.Temperature)]</property>
                 <property name="Property7">$LOCALIZE[402]: $INFO[Window.Property(Hourly.24.FeelsLike)]</property>
                 <property name="Property3">$INFO[Window(Weather).Property(Hourly.24.Outlook)]</property>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 833d0665..bc523f62 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -579,6 +579,16 @@
                             <label2>$LOCALIZE[305]</label2>
                             <onclick>Skin.ToggleSetting(Use_Artist_Slideshow)</onclick>
                         </item>
+                        <item id="93">
+                            <label>$LOCALIZE[31519]</label>
+                            <label2>$INFO[Skin.String(weatherArtPath)]</label2>
+                            <onclick>Skin.SetPath(weatherArtPath)</onclick>
+                        </item>
+                        <item id="94">
+                            <label>$LOCALIZE[31520]</label>
+                            <label2>$INFO[Skin.String(weatherIconPath)]</label2>
+                            <onclick>Skin.SetPath(weatherIconPath)</onclick>
+                        </item>
                     </content>
                 </control>
                 <control type="scrollbar" id="503">
diff --git a/language/English/strings.po b/language/English/strings.po
index 982c0690..111e3b7d 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -517,7 +517,15 @@ msgctxt "#31518"
 msgid "Random Image"
 msgstr ""
 
-#empty strings from id 31518 to 31900
+msgctxt "#31519"
+msgid "Root Folder for Custom Weather Fanarts"
+msgstr ""
+
+msgctxt "#31520"
+msgid "Root Folder for Custom Weather Icons"
+msgstr ""
+
+#empty strings from id 31521 to 31900
 #Weather plugin
 
 msgctxt "#31901"
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index 192d093a..b7661d6b 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -14,7 +14,7 @@
     <icon labelID="31972">special://skin/backgrounds/Clips.jpg</icon>
     <icon labelID="31971">special://skin/backgrounds/Concerts.jpg</icon>
     <!--<icon labelID="weather">special://skin/backgrounds/Weather.jpg</icon>-->
-    <icon labelID="weather">$INFO[Weather.fanartcode,special://skin/backgrounds/weather/,.jpg]</icon>
+    <icon labelID="weather">$VAR[WeatherFanartPath]$INFO[Weather.fanartcode].jpg</icon>
     <icon labelID="programs">special://skin/backgrounds/Addons.jpg</icon>
     <icon labelID="dvd">special://skin/backgrounds/Dvds.jpg</icon>
     <icon labelID="settings">special://skin/backgrounds/Settings.jpg</icon>