[Confluence] Update weather window

9 files changed, 1765 insertions, 1573 deletions

diff --git a/addons/skin.confluence/720p/MyWeather.xml b/addons/skin.confluence/720p/MyWeather.xml
index 4b2ed1186e..62438553c8 100644
--- a/addons/skin.confluence/720p/MyWeather.xml
+++ b/addons/skin.confluence/720p/MyWeather.xml
@@ -203,138 +203,190 @@
 					<height>4</height>
 					<texture>separator.png</texture>
 				</control>
-				<control type="label">
-					<description>current feels like label</description>
+				<control type="grouplist">
 					<left>0</left>
 					<top>400</top>
 					<width>170</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>right</align>
-					<aligny>center</aligny>
-					<label>$LOCALIZE[402] :</label>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current dew label</description>
-					<left>0</left>
-					<top>430</top>
-					<width>170</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>right</align>
-					<aligny>center</aligny>
-					<label>$LOCALIZE[405] :</label>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current humidity label</description>
-					<left>0</left>
-					<top>460</top>
-					<width>170</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>right</align>
-					<aligny>center</aligny>
-					<label>$LOCALIZE[406] :</label>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current UV Index label</description>
-					<left>0</left>
-					<top>490</top>
-					<width>170</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>right</align>
-					<aligny>center</aligny>
-					<label>$LOCALIZE[403] :</label>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current Wind label</description>
-					<left>0</left>
-					<top>520</top>
-					<width>170</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>right</align>
-					<aligny>center</aligny>
-					<label>$LOCALIZE[404] :</label>
-					<textcolor>grey2</textcolor>
-					<shadowcolor>black</shadowcolor>
+					<height>180</height>
+					<itemgap>0</itemgap>
+					<control type="label">
+						<description>current feels like label</description>
+						<left>0</left>
+						<top>0</top>
+						<width>170</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$LOCALIZE[402] :</label>
+						<textcolor>grey2</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.FeelsLike))</visible>
+					</control>
+					<control type="label">
+						<description>current dew label</description>
+						<left>0</left>
+						<top>0</top>
+						<width>170</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$LOCALIZE[405] :</label>
+						<textcolor>grey2</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.DewPoint))</visible>
+					</control>
+					<control type="label">
+						<description>current humidity label</description>
+						<left>0</left>
+						<top>0</top>
+						<width>170</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$LOCALIZE[406] :</label>
+						<textcolor>grey2</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.Humidity))</visible>
+					</control>
+					<control type="label">
+						<description>current UV Index label</description>
+						<left>0</left>
+						<top>0</top>
+						<width>170</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$LOCALIZE[403] :</label>
+						<textcolor>grey2</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.UVIndex))</visible>
+					</control>
+					<control type="label">
+						<description>current Precipitation label</description>
+						<left>0</left>
+						<top>0</top>
+						<width>170</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$LOCALIZE[33021] :</label>
+						<textcolor>grey2</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.Precipitation))</visible>
+					</control>
+					<control type="label">
+						<description>current Wind label</description>
+						<left>0</left>
+						<top>0</top>
+						<width>170</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$LOCALIZE[404] :</label>
+						<textcolor>grey2</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.Wind))</visible>
+					</control>
 				</control>
-				<control type="label">
-					<description>current feels like Value</description>
+				<control type="grouplist">
 					<left>185</left>
 					<top>400</top>
 					<width>300</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>$INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]</label>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current dew Value</description>
-					<left>185</left>
-					<top>430</top>
-					<width>300</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>left</align>
-					<aligny>center</aligny>
-					<label>$INFO[Window.Property(Current.DewPoint)]$INFO[System.TemperatureUnits]</label>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current humidity Value</description>
-					<left>185</left>
-					<top>460</top>
-					<width>300</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>left</align>
-					<aligny>center</aligny>
-					<info>Window.Property(Current.Humidity)</info>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current UV Index Value</description>
-					<left>185</left>
-					<top>490</top>
-					<width>300</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>left</align>
-					<aligny>center</aligny>
-					<info>Window.Property(Current.UVIndex)</info>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="label">
-					<description>current Wind Value</description>
-					<left>185</left>
-					<top>520</top>
-					<width>300</width>
-					<height>35</height>
-					<font>font13</font>
-					<align>left</align>
-					<aligny>center</aligny>
-					<info>Window.Property(Current.Wind)</info>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
+					<height>180</height>
+					<itemgap>0</itemgap>
+					<control type="label">
+						<description>current feels like Value</description>
+						<left>0</left>
+						<top>0</top>
+						<width>300</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]</label>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.FeelsLike))</visible>
+					</control>
+					<control type="label">
+						<description>current dew Value</description>
+						<left>0</left>
+						<top>0</top>
+						<width>300</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(Current.DewPoint)]$INFO[System.TemperatureUnits]</label>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.DewPoint))</visible>
+					</control>
+					<control type="label">
+						<description>current humidity Value</description>
+						<left>0</left>
+						<top>0</top>
+						<width>300</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<info>Window.Property(Current.Humidity)</info>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.Humidity))</visible>
+					</control>
+					<control type="label">
+						<description>current UV Index Value</description>
+						<left>0</left>
+						<top>0</top>
+						<width>300</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<info>Window.Property(Current.UVIndex)</info>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.UVIndex))</visible>
+					</control>
+					<control type="label">
+						<description>current Precipitation Value</description>
+						<left>0</left>
+						<top>0</top>
+						<width>300</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<info>Window.Property(Current.Precipitation)</info>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.Precipitation))</visible>
+					</control>
+					<control type="label">
+						<description>current Wind Value</description>
+						<left>0</left>
+						<top>0</top>
+						<width>300</width>
+						<height>28</height>
+						<font>font13</font>
+						<align>left</align>
+						<aligny>center</aligny>
+						<info>Window.Property(Current.Wind)</info>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Current.Wind))</visible>
+					</control>
 				</control>
 				<control type="group">
-					<visible>!IsEmpty(Window.Property(36Hour.IsFetched))</visible>
+					<visible>!IsEmpty(Window.Property(Today.IsFetched))</visible>
 					<control type="label">
 						<description>Sunrise Label</description>
 						<left>30</left>
@@ -347,6 +399,7 @@
 						<label>$LOCALIZE[33027] : [COLOR=white]$INFO[Window.Property(Today.Sunrise)][/COLOR]</label>
 						<textcolor>grey2</textcolor>
 						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Today.Sunrise))</visible>
 					</control>
 					<control type="label">
 						<description>Sunset label</description>
@@ -360,339 +413,11 @@
 						<label>$LOCALIZE[33028] : [COLOR=white]$INFO[Window.Property(Today.Sunset)][/COLOR]</label>
 						<textcolor>grey2</textcolor>
 						<shadowcolor>black</shadowcolor>
+						<visible>!IsEmpty(Window.Property(Today.Sunset))</visible>
 					</control>
 				</control>
 			</control>
 			<control type="group">
-				<visible>IsEmpty(Window.Property(Today.IsFetched))</visible>
-				<left>580</left>
-				<top>40</top>
-				<control type="image">
-					<left>0</left>
-					<top>0</top>
-					<width>650</width>
-					<height>620</height>
-					<texture border="20">ContentPanel.png</texture>
-				</control>
-				<control type="image">
-					<left>0</left>
-					<top>612</top>
-					<width>650</width>
-					<height>64</height>
-					<texture border="10">ContentPanelMirror.png</texture>
-				</control>
-				<control type="image">
-					<left>8</left>
-					<top>5</top>
-					<width>634</width>
-					<height>45</height>
-					<texture>dialogheader.png</texture>
-				</control>
-				<control type="label">
-					<description>header label</description>
-					<left>20</left>
-					<top>15</top>
-					<width>610</width>
-					<height>30</height>
-					<font>font13_title</font>
-					<label>10508</label>
-					<align>center</align>
-					<aligny>center</aligny>
-					<textcolor>white</textcolor>
-					<shadowcolor>black</shadowcolor>
-				</control>
-				<control type="list" id="50">
-					<left>15</left>
-					<top>60</top>
-					<width>600</width>
-					<height>541</height>
-					<onleft>9000</onleft>
-					<onright>61</onright>
-					<onup>50</onup>
-					<ondown>50</ondown>
-					<viewtype label="535">list</viewtype>
-					<pagecontrol>61</pagecontrol>
-					<scrolltime>200</scrolltime>
-					<itemlayout height="135" width="600">
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>600</width>
-							<height>136</height>
-							<texture border="0,5,0,5">MenuItemNF.png</texture>
-						</control>
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>600</width>
-							<height>136</height>
-							<texture border="0,5,0,5">MenuItemNF.png</texture>
-						</control>
-						<control type="label">
-							<left>150</left>
-							<top>5</top>
-							<width>300</width>
-							<height>25</height>
-							<font>font13_title</font>
-							<textcolor>white</textcolor>
-							<shadowcolor>black</shadowcolor>
-							<selectedcolor>selected</selectedcolor>
-							<align>center</align>
-							<aligny>center</aligny>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-						<control type="image">
-							<left>460</left>
-							<top>0</top>
-							<width>135</width>
-							<height>135</height>
-							<aspectratio>keep</aspectratio>
-							<texture>$INFO[ListItem.ActualIcon]</texture>
-						</control>
-						<control type="label">
-							<left>30</left>
-							<top>35</top>
-							<width>390</width>
-							<height>30</height>
-							<font>font13</font>
-							<textcolor>white</textcolor>
-							<shadowcolor>black</shadowcolor>
-							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
-							<aligny>center</aligny>
-							<label>[COLOR=grey2]$LOCALIZE[419] : [/COLOR]$INFO[ListItem.Property(HighTemp)]$INFO[ListItem.Property(TempUnits)]     [COLOR=grey2]$LOCALIZE[418] : [/COLOR]$INFO[ListItem.Property(LowTemp)]$INFO[ListItem.Property(TempUnits)]</label>
-							<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
-						</control>
-						<control type="textbox">
-							<left>30</left>
-							<top>70</top>
-							<width>400</width>
-							<height>50</height>
-							<font>font13</font>
-							<textcolor>white</textcolor>
-							<shadowcolor>black</shadowcolor>
-							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
-							<label>$INFO[ListItem.Property(Outlook)]</label>
-						</control>
-					</itemlayout>
-					<focusedlayout height="135" width="600">
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>600</width>
-							<height>136</height>
-							<texture border="0,2,0,2">MenuItemNF.png</texture>
-							<visible>!Control.HasFocus(50)</visible>
-							<include>VisibleFadeEffect</include>
-						</control>
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>600</width>
-							<height>136</height>
-							<texture border="0,2,0,2">MenuItemNF.png</texture>
-							<visible>!Control.HasFocus(50)</visible>
-							<include>VisibleFadeEffect</include>
-						</control>
-						<control type="image">
-							<left>0</left>
-							<top>0</top>
-							<width>600</width>
-							<height>136</height>
-							<texture border="10">button-focus2.png</texture>
-							<visible>Control.HasFocus(50)</visible>
-							<include>VisibleFadeEffect</include>
-						</control>
-						<control type="label">
-							<left>150</left>
-							<top>5</top>
-							<width>300</width>
-							<height>25</height>
-							<font>font13_title</font>
-							<textcolor>white</textcolor>
-							<shadowcolor>black</shadowcolor>
-							<selectedcolor>selected</selectedcolor>
-							<align>center</align>
-							<aligny>center</aligny>
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-						<control type="image">
-							<left>460</left>
-							<top>0</top>
-							<width>135</width>
-							<height>135</height>
-							<aspectratio>keep</aspectratio>
-							<texture>$INFO[ListItem.ActualIcon]</texture>
-						</control>
-						<control type="label">
-							<left>30</left>
-							<top>35</top>
-							<width>390</width>
-							<height>30</height>
-							<font>font13</font>
-							<textcolor>white</textcolor>
-							<shadowcolor>black</shadowcolor>
-							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
-							<aligny>center</aligny>
-							<label>[COLOR=grey2]$LOCALIZE[419] : [/COLOR]$INFO[ListItem.Property(HighTemp)]$INFO[ListItem.Property(TempUnits)]     [COLOR=grey2]$LOCALIZE[418] : [/COLOR]$INFO[ListItem.Property(LowTemp)]$INFO[ListItem.Property(TempUnits)]</label>
-							<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
-						</control>
-						<control type="textbox">
-							<left>30</left>
-							<top>70</top>
-							<width>400</width>
-							<height>50</height>
-							<font>font13</font>
-							<textcolor>white</textcolor>
-							<shadowcolor>black</shadowcolor>
-							<selectedcolor>selected</selectedcolor>
-							<align>left</align>
-							<label>$INFO[ListItem.Property(Outlook)]</label>
-						</control>
-					</focusedlayout>
-					<content>
-						<item>
-							<label>$LOCALIZE[31909]</label>
-							<icon>-</icon>
-							<onclick>noop</onclick>
-							<visible>!Weather.IsFetched</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day0.Title)]</label>
-							<icon>$INFO[Window.Property(Day0.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day0.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day0.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day0.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day1.Title)]</label>
-							<icon>$INFO[Window.Property(Day1.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day1.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day1.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day1.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day1.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day2.Title)]</label>
-							<icon>$INFO[Window.Property(Day2.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day2.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day2.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day2.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day2.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day3.Title)]</label>
-							<icon>$INFO[Window.Property(Day3.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day3.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day3.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day3.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day3.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day4.Title)]</label>
-							<icon>$INFO[Window.Property(Day4.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day4.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day4.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day4.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day4.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day5.Title)]</label>
-							<icon>$INFO[Window.Property(Day5.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day5.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day5.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day5.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day5.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day6.Title)]</label>
-							<icon>$INFO[Window.Property(Day6.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day6.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day6.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day6.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day6.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day7.Title)]</label>
-							<icon>$INFO[Window.Property(Day7.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day7.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day7.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day7.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day7.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day8.Title)]</label>
-							<icon>$INFO[Window.Property(Day8.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day8.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day8.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day8.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day8.Title))</visible>
-						</item>
-						<item>
-							<label>$INFO[Window.Property(Day9.Title)]</label>
-							<icon>$INFO[Window.Property(Day9.OutlookIcon)]</icon>
-							<property name="HighTemp">$INFO[Window.Property(Day9.HighTemp)]</property>
-							<property name="LowTemp">$INFO[Window.Property(Day9.LowTemp)]</property>
-							<property name="Outlook">$INFO[Window.Property(Day9.Outlook)]</property>
-							<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
-							<onclick>noop</onclick>
-							<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day9.Title))</visible>
-						</item>
-					</content>
-				</control>
-				<control type="scrollbar" id="61">
-					<left>615</left>
-					<top>60</top>
-					<width>25</width>
-					<height>540</height>
-					<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-					<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-					<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-					<textureslidernib>ScrollBarNib.png</textureslidernib>
-					<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-					<onleft>50</onleft>
-					<onright>9000</onright>
-					<showonepage>true</showonepage>
-					<orientation>vertical</orientation>
-					<visible>Control.IsVisible(50)</visible>
-				</control>
-				<control type="label">
-					<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
-					<description>number of files/pages</description>
-					<left>90</left>
-					<top>627</top>
-					<width>570</width>
-					<font>font12</font>
-					<align>right</align>
-					<scroll>true</scroll>
-					<textcolor>grey</textcolor>
-					<shadowcolor>black</shadowcolor>
-					<label>([COLOR=blue]$INFO[Container(50).NumItems][/COLOR]) $LOCALIZE[12393] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(50).CurrentPage]/$INFO[Container(50).NumPages][/COLOR])</label>
-				</control>
-			</control>
-			<control type="group">
-				<visible>!IsEmpty(Window.Property(Today.IsFetched))</visible>
 				<left>580</left>
 				<top>40</top>
 				<control type="image">
@@ -717,11 +442,12 @@
 					<texture>dialogheader.png</texture>
 				</control>
 				<control type="group" id="50">
-					<include condition="!IsEmpty(Window.Property(Daily.IsFetched))">Weather10DayForcast</include>
-					<include condition="!IsEmpty(Window.Property(36Hour.IsFetched))">Weather36HourForcast</include>
-					<include condition="!IsEmpty(Window.Property(Weekend.IsFetched))">WeatherWeekendForcast</include>
-					<include condition="!IsEmpty(Window.Property(Hourly.IsFetched))">WeatherHourlyForcast</include>
-					<include condition="!IsEmpty(Window.Property(Alerts.IsFetched)) + !IsEmpty(Window.Property(Map.IsFetched))">WeatherMapAlerts</include>
+					<include>WeatherDaily</include>
+					<include>Weather36Hour</include>
+					<include>WeatherWeekend</include>
+					<include>WeatherHourly</include>
+					<include>WeatherMaps</include>
+					<include>WeatherAlerts</include>
 				</control>
 			</control>
 		</control>
@@ -778,7 +504,7 @@
 					</control>
 				</control>
 				<control type="button" id="302">
-					<description>10 day forcast button</description>
+					<description>Daily forcast button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 					<label>31904</label>
@@ -810,12 +536,20 @@
 					<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
 				</control>
 				<control type="button" id="306">
-					<description>Map and alerts button</description>
+					<description>Maps button</description>
 					<textwidth>235</textwidth>
 					<include>ButtonCommonValues</include>
 					<label>31910</label>
 					<onfocus>SetProperty(Weather.CurrentView,map)</onfocus>
-					<visible>!IsEmpty(Window.Property(Alerts.IsFetched)) + !IsEmpty(Window.Property(Map.IsFetched))">WeatherMapAlerts</visible>
+					<visible>!IsEmpty(Window.Property(Map.IsFetched))</visible>
+				</control>
+				<control type="button" id="307">
+					<description>Alerts button</description>
+					<textwidth>235</textwidth>
+					<include>ButtonCommonValues</include>
+					<label>33050</label>
+					<onfocus>SetProperty(Weather.CurrentView,alerts)</onfocus>
+					<visible>!IsEmpty(Window.Property(Alerts.IsFetched))</visible>
 				</control>
 				<control type="label" id="201">
 					<width>250</width>
diff --git a/addons/skin.confluence/720p/ViewsWeather.xml b/addons/skin.confluence/720p/ViewsWeather.xml
new file mode 100644
index 0000000000..553f2cd5f0
--- /dev/null
+++ b/addons/skin.confluence/720p/ViewsWeather.xml
@@ -0,0 +1,1568 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+	<include name="WeatherDaily">
+		<control type="group">
+			<control type="label">
+				<description>header label</description>
+				<left>20</left>
+				<top>15</top>
+				<width>610</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>31904</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<include>VisibleFadeEffect</include>
+				<visible>Control.IsVisible(51)</visible>
+			</control>
+			<control type="list" id="51">
+				<left>15</left>
+				<top>60</top>
+				<width>600</width>
+				<height>541</height>
+				<onleft>9000</onleft>
+				<onright>61</onright>
+				<onup>51</onup>
+				<ondown>51</ondown>
+				<viewtype label="535">list</viewtype>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<include>VisibleFadeEffect</include>
+				<visible>IsEmpty(Window.Property(Weather.CurrentView))</visible>
+				<itemlayout height="135" width="600" condition="IsEmpty(Window.Property(Daily.IsFetched))">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,5,0,5">MenuItemNF.png</texture>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,5,0,5">MenuItemNF.png</texture>
+					</control>
+					<control type="label">
+						<left>150</left>
+						<top>5</top>
+						<width>300</width>
+						<height>25</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+					<control type="image">
+						<left>460</left>
+						<top>0</top>
+						<width>135</width>
+						<height>135</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.ActualIcon]</texture>
+					</control>
+					<control type="label">
+						<left>30</left>
+						<top>35</top>
+						<width>390</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$LOCALIZE[419] : [/COLOR]$INFO[ListItem.Property(HighTemp)]$INFO[ListItem.Property(TempUnits)]     [COLOR=grey2]$LOCALIZE[418] : [/COLOR]$INFO[ListItem.Property(LowTemp)]$INFO[ListItem.Property(TempUnits)]</label>
+						<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
+					</control>
+					<control type="textbox">
+						<left>30</left>
+						<top>70</top>
+						<width>400</width>
+						<height>50</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Property(Outlook)]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="135" width="600" condition="IsEmpty(Window.Property(Daily.IsFetched))">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,2,0,2">MenuItemNF.png</texture>
+						<visible>!Control.HasFocus(51)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,2,0,2">MenuItemNF.png</texture>
+						<visible>!Control.HasFocus(51)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="10">button-focus2.png</texture>
+						<visible>Control.HasFocus(51)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<left>150</left>
+						<top>5</top>
+						<width>300</width>
+						<height>25</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+					<control type="image">
+						<left>460</left>
+						<top>0</top>
+						<width>135</width>
+						<height>135</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.ActualIcon]</texture>
+					</control>
+					<control type="label">
+						<left>30</left>
+						<top>35</top>
+						<width>390</width>
+						<height>30</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$LOCALIZE[419] : [/COLOR]$INFO[ListItem.Property(HighTemp)]$INFO[ListItem.Property(TempUnits)]     [COLOR=grey2]$LOCALIZE[418] : [/COLOR]$INFO[ListItem.Property(LowTemp)]$INFO[ListItem.Property(TempUnits)]</label>
+						<visible>!IsEmpty(ListItem.Property(HighTemp))</visible>
+					</control>
+					<control type="textbox">
+						<left>30</left>
+						<top>70</top>
+						<width>400</width>
+						<height>50</height>
+						<font>font13</font>
+						<textcolor>white</textcolor>
+						<shadowcolor>black</shadowcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>left</align>
+						<label>$INFO[ListItem.Property(Outlook)]</label>
+					</control>
+				</focusedlayout>
+				<itemlayout height="135" width="600" condition="!IsEmpty(Window.Property(Daily.IsFetched))">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,5,0,5">MenuItemNF.png</texture>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>0</top>
+						<width>100</width>
+						<height>120</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+					<control type="image">
+						<left>110</left>
+						<top>5</top>
+						<width>80</width>
+						<height>80</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.Thumb]</texture>
+					</control>
+					<control type="label">
+						<left>200</left>
+						<top>0</top>
+						<width>390</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+					<control type="textbox">
+						<left>5</left>
+						<top>80</top>
+						<width>590</width>
+						<height>50</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[ListItem.ActualIcon]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="135" width="600" condition="!IsEmpty(Window.Property(Daily.IsFetched))">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,2,0,2">MenuItemNF.png</texture>
+						<visible>!Control.HasFocus(51)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="10">button-focus2.png</texture>
+						<visible>Control.HasFocus(51)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>0</top>
+						<width>100</width>
+						<height>120</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+					<control type="image">
+						<left>110</left>
+						<top>5</top>
+						<width>80</width>
+						<height>80</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.Thumb]</texture>
+					</control>
+					<control type="label">
+						<left>200</left>
+						<top>0</top>
+						<width>390</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+					<control type="textbox">
+						<left>5</left>
+						<top>80</top>
+						<width>590</width>
+						<height>50</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[ListItem.ActualIcon]</label>
+					</control>
+				</focusedlayout>
+				<content>
+					<item>
+						<label>-</label>
+						<icon>-</icon>
+						<onclick>noop</onclick>
+						<visible>!Weather.IsFetched</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day0.Title)]</label>
+						<icon>$INFO[Window.Property(Day0.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day0.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day0.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day0.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day0.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day1.Title)]</label>
+						<icon>$INFO[Window.Property(Day1.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day1.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day1.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day1.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day1.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day2.Title)]</label>
+						<icon>$INFO[Window.Property(Day2.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day2.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day2.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day2.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day2.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day3.Title)]</label>
+						<icon>$INFO[Window.Property(Day3.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day3.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day3.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day3.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day3.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day4.Title)]</label>
+						<icon>$INFO[Window.Property(Day4.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day4.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day4.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day4.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day4.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day5.Title)]</label>
+						<icon>$INFO[Window.Property(Day5.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day5.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day5.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day5.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day5.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Day6.Title)]</label>
+						<icon>$INFO[Window.Property(Day6.OutlookIcon)]</icon>
+						<property name="HighTemp">$INFO[Window.Property(Day6.HighTemp)]</property>
+						<property name="LowTemp">$INFO[Window.Property(Day6.LowTemp)]</property>
+						<property name="Outlook">$INFO[Window.Property(Day6.Outlook)]</property>
+						<property name="TempUnits">$INFO[System.TemperatureUnits]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Day6.Outlook)) + IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.1.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.1.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.1.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.1.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.1.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.1.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.1.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.1.WindSpeed)] $INFO[Window.Property(Daily.1.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.1.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.2.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.2.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.2.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.2.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.2.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.2.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.2.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.2.WindSpeed)] $INFO[Window.Property(Daily.2.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.2.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.3.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.3.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.3.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.3.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.3.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.3.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.3.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.3.WindSpeed)] $INFO[Window.Property(Daily.3.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.3.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.4.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.4.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.4.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.4.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.4.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.4.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.4.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.4.WindSpeed)] $INFO[Window.Property(Daily.4.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.4.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.5.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.5.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.5.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.5.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.5.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.5.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.5.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.5.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.5.WindSpeed)] $INFO[Window.Property(Daily.5.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.5.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.6.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.6.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.6.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.6.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.6.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.6.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.6.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.6.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.6.WindSpeed)] $INFO[Window.Property(Daily.6.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.6.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.7.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.7.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.7.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.7.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.7.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.7.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.7.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.7.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.7.WindSpeed)] $INFO[Window.Property(Daily.7.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.7.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.8.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.8.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.8.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.8.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.8.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.8.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.8.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.8.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.8.WindSpeed)] $INFO[Window.Property(Daily.8.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.8.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.9.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.9.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.9.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.9.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.9.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.9.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.9.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.9.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.9.WindSpeed)] $INFO[Window.Property(Daily.9.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.9.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.10.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.10.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.10.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.10.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.10.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.10.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.10.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.10.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.10.WindSpeed)] $INFO[Window.Property(Daily.10.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.10.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.11.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.11.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.11.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.11.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.11.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.11.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.11.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.11.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.11.WindSpeed)] $INFO[Window.Property(Daily.11.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.11.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.12.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.12.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.12.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.12.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.12.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.12.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.12.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.12.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.12.WindSpeed)] $INFO[Window.Property(Daily.12.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.12.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.13.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.13.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.13.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.13.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.13.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.13.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.13.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.13.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.13.WindSpeed)] $INFO[Window.Property(Daily.13.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.13.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Daily.4.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.4.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Daily.4.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.4.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.4.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.14.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Daily.4.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Daily.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.4.WindSpeed)] $INFO[Window.Property(Daily.4.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Daily.14.Outlook)) + !IsEmpty(Window.Property(Daily.IsFetched))</visible>
+					</item>
+				</content>
+			</control>
+			<control type="scrollbar" id="61">
+				<left>615</left>
+				<top>60</top>
+				<width>25</width>
+				<height>540</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft>51</onleft>
+				<onright>9000</onright>
+				<showonepage>true</showonepage>
+				<orientation>vertical</orientation>
+				<visible>Control.IsVisible(51)</visible>
+			</control>
+			<control type="label">
+				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
+				<description>number of files/pages</description>
+				<left>90</left>
+				<top>627</top>
+				<width>570</width>
+				<font>font12</font>
+				<align>right</align>
+				<scroll>true</scroll>
+				<textcolor>grey</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<label>([COLOR=blue]$INFO[Container(51).NumItems][/COLOR]) $LOCALIZE[12393] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(51).CurrentPage]/$INFO[Container(51).NumPages][/COLOR])</label>
+				<visible>Control.IsVisible(51)</visible>
+			</control>
+		</control>
+	</include>
+	<include name="Weather36Hour">
+		<control type="group">
+			<visible>StringCompare(Window.Property(Weather.CurrentView),36hour) + !IsEmpty(Window.Property(36Hour.IsFetched))</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="button" id="997">
+				<description>Hidden Button for focus</description>
+				<left>-600</left>
+				<top>-20</top>
+				<width>1</width>
+				<height>1</height>
+				<texturenofocus>-</texturenofocus>
+				<texturefocus>-</texturefocus>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<left>20</left>
+				<top>15</top>
+				<width>610</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>31901</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="group">
+				<left>20</left>
+				<top>50</top>
+				<control type="group">
+					<left>0</left>
+					<top>0</top>
+					<control type="label">
+						<left>0</left>
+						<top>5</top>
+						<width>600</width>
+						<height>30</height>
+						<font>font13_title</font>
+						<textcolor>blue</textcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(36Hour.1.Heading)]</label>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>10</top>
+						<width>120</width>
+						<height>110</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[Window.Property(36Hour.1.OutlookIcon)]</texture>
+					</control>
+					<control type="label">
+						<left>120</left>
+						<top>40</top>
+						<width>100</width>
+						<height>40</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.1.Temperature),[B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<right>90</right>
+						<top>20</top>
+						<width>390</width>
+						<height>130</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(36Hour.1.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(36Hour.1.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(36Hour.1.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label>
+					</control>
+					<control type="textbox">
+						<left>0</left>
+						<top>145</top>
+						<width>590</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[Window.Property(36hour.1.Outlook),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>180</top>
+						<width>650</width>
+						<height>4</height>
+						<texture>separator.png</texture>
+					</control>
+				</control>
+				<control type="group">
+					<left>0</left>
+					<top>185</top>
+					<control type="label">
+						<left>0</left>
+						<top>5</top>
+						<width>600</width>
+						<height>30</height>
+						<font>font13_title</font>
+						<textcolor>blue</textcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(36Hour.2.Heading)]</label>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>10</top>
+						<width>120</width>
+						<height>110</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[Window.Property(36Hour.2.OutlookIcon)]</texture>
+					</control>
+					<control type="label">
+						<left>120</left>
+						<top>40</top>
+						<width>100</width>
+						<height>40</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.2.Temperature),[B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<right>90</right>
+						<top>20</top>
+						<width>390</width>
+						<height>130</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(36Hour.2.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(36Hour.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(36Hour.2.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label>
+					</control>
+					<control type="textbox">
+						<left>0</left>
+						<top>145</top>
+						<width>590</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[Window.Property(36hour.2.Outlook),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>180</top>
+						<width>650</width>
+						<height>4</height>
+						<texture>separator.png</texture>
+					</control>
+				</control>
+				<control type="group">
+					<left>0</left>
+					<top>370</top>
+					<control type="label">
+						<left>0</left>
+						<top>5</top>
+						<width>600</width>
+						<height>30</height>
+						<font>font13_title</font>
+						<textcolor>blue</textcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(36Hour.3.Heading)]</label>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>10</top>
+						<width>120</width>
+						<height>110</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[Window.Property(36Hour.3.OutlookIcon)]</texture>
+					</control>
+					<control type="label">
+						<left>120</left>
+						<top>40</top>
+						<width>100</width>
+						<height>40</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.3.Temperature),[B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<right>90</right>
+						<top>20</top>
+						<width>390</width>
+						<height>130</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(36Hour.3.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(36Hour.3.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(36Hour.3.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]]</label>
+					</control>
+					<control type="textbox">
+						<left>0</left>
+						<top>145</top>
+						<width>590</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[Window.Property(36hour.3.Outlook),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label>
+					</control>
+				</control>
+			</control>
+		</control>
+	</include>
+	<include name="WeatherWeekend">
+		<control type="group">
+			<visible>StringCompare(Window.Property(Weather.CurrentView),weekend) + !IsEmpty(Window.Property(Weekend.IsFetched))</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="button" id="998">
+				<description>Hidden Button for focus</description>
+				<left>-600</left>
+				<top>-20</top>
+				<width>1</width>
+				<height>1</height>
+				<texturenofocus>-</texturenofocus>
+				<texturefocus>-</texturefocus>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<left>20</left>
+				<top>15</top>
+				<width>610</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>31903</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="group">
+				<left>20</left>
+				<top>50</top>
+				<control type="group">
+					<left>0</left>
+					<top>0</top>
+					<control type="label">
+						<left>0</left>
+						<top>5</top>
+						<width>600</width>
+						<height>30</height>
+						<font>font13_title</font>
+						<textcolor>blue</textcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(Weekend.1.LongDay)] - $INFO[Window.Property(Weekend.1.ShortDate)]</label>
+					</control>
+					<control type="image">
+						<left>10</left>
+						<top>20</top>
+						<width>130</width>
+						<height>160</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[Window.Property(Weekend.1.OutlookIcon)]</texture>
+					</control>
+					<control type="label">
+						<left>140</left>
+						<top>40</top>
+						<width>100</width>
+						<height>50</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.1.HighTemperature),[B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<left>140</left>
+						<top>100</top>
+						<width>100</width>
+						<height>50</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.1.LowTemperature),[B] ,[/B]]</label>
+					</control>
+					<control type="textbox">
+						<left>240</left>
+						<top>40</top>
+						<width>350</width>
+						<height>130</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<align>right</align>
+						<label>$INFO[Window.Property(Weekend.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.1.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.1.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>180</top>
+						<width>590</width>
+						<height>20</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(Weekend.1.WindSpeed),[COLOR=grey2]$LOCALIZE[404]: [/COLOR]]$INFO[Window.Property(Weekend.1.WindDirection), - ]</label>
+					</control>
+					<control type="textbox">
+						<left>0</left>
+						<top>215</top>
+						<width>590</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[Window.Property(Weekend.1.Outlook),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>270</top>
+						<width>650</width>
+						<height>4</height>
+						<texture>separator.png</texture>
+					</control>
+				</control>
+				<control type="group">
+					<left>0</left>
+					<top>280</top>
+					<control type="label">
+						<left>0</left>
+						<top>5</top>
+						<width>600</width>
+						<height>30</height>
+						<font>font13_title</font>
+						<textcolor>blue</textcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(Weekend.2.LongDay)] - $INFO[Window.Property(Weekend.2.ShortDate)]</label>
+					</control>
+					<control type="image">
+						<left>10</left>
+						<top>20</top>
+						<width>130</width>
+						<height>160</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[Window.Property(Weekend.2.OutlookIcon)]</texture>
+					</control>
+					<control type="label">
+						<left>140</left>
+						<top>40</top>
+						<width>100</width>
+						<height>50</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.2.HighTemperature),[B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<left>140</left>
+						<top>100</top>
+						<width>100</width>
+						<height>50</height>
+						<font>font13_title</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.2.LowTemperature),[B] ,[/B]]</label>
+					</control>
+					<control type="textbox">
+						<left>240</left>
+						<top>40</top>
+						<width>350</width>
+						<height>130</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<align>right</align>
+						<label>$INFO[Window.Property(Weekend.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.Cloudiness),[COLOR=grey2]$LOCALIZE[387] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>180</top>
+						<width>590</width>
+						<height>20</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[Window.Property(Weekend.2.WindSpeed),[COLOR=grey2]$LOCALIZE[404]: [/COLOR]]$INFO[Window.Property(Weekend.2.WindDirection), - ]</label>
+					</control>
+					<control type="textbox">
+						<left>0</left>
+						<top>215</top>
+						<width>590</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[Window.Property(Weekend.2.Outlook),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label>
+					</control>
+				</control>
+			</control>
+		</control>
+	</include>
+	<include name="WeatherHourly">
+		<control type="group">
+			<control type="label">
+				<description>header label</description>
+				<left>20</left>
+				<top>15</top>
+				<width>610</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>31902</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<include>VisibleFadeEffect</include>
+				<visible>Control.IsVisible(52)</visible>
+			</control>
+			<control type="list" id="52">
+				<left>15</left>
+				<top>60</top>
+				<width>600</width>
+				<height>541</height>
+				<onleft>9000</onleft>
+				<onright>62</onright>
+				<onup>52</onup>
+				<ondown>52</ondown>
+				<viewtype label="535">list</viewtype>
+				<pagecontrol>62</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<include>VisibleFadeEffect</include>
+				<visible>StringCompare(Window.Property(Weather.CurrentView),hourly) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+				<itemlayout height="135" width="600">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,5,0,5">MenuItemNF.png</texture>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>0</top>
+						<width>100</width>
+						<height>120</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+					<control type="image">
+						<left>110</left>
+						<top>5</top>
+						<width>80</width>
+						<height>80</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.Thumb]</texture>
+					</control>
+					<control type="label">
+						<left>200</left>
+						<top>5</top>
+						<width>390</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+					<control type="textbox">
+						<left>5</left>
+						<top>80</top>
+						<width>590</width>
+						<height>50</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[ListItem.ActualIcon]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout height="135" width="600">
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="0,2,0,2">MenuItemNF.png</texture>
+						<visible>!Control.HasFocus(52)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<left>0</left>
+						<top>0</top>
+						<width>600</width>
+						<height>136</height>
+						<texture border="10">button-focus2.png</texture>
+						<visible>Control.HasFocus(52)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<left>0</left>
+						<top>0</top>
+						<width>100</width>
+						<height>120</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label]</label>
+					</control>
+					<control type="image">
+						<left>110</left>
+						<top>5</top>
+						<width>80</width>
+						<height>80</height>
+						<aspectratio>keep</aspectratio>
+						<texture>$INFO[ListItem.Thumb]</texture>
+					</control>
+					<control type="label">
+						<left>200</left>
+						<top>5</top>
+						<width>390</width>
+						<height>70</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>right</align>
+						<aligny>center</aligny>
+						<label>$INFO[ListItem.Label2]</label>
+					</control>
+					<control type="textbox">
+						<left>5</left>
+						<top>80</top>
+						<width>590</width>
+						<height>50</height>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+						<selectedcolor>selected</selectedcolor>
+						<align>center</align>
+						<label>$INFO[ListItem.ActualIcon]</label>
+					</control>
+				</focusedlayout>
+				<content>
+					<item>
+						<icon>$LOCALIZE[31909]</icon>
+						<onclick>noop</onclick>
+						<visible>IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.1.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.1.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.1.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.1.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.1.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.1.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.1.WindSpeed)] $INFO[Window.Property(Hourly.1.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.1.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.2.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.2.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.2.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.2.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.2.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.2.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.2.WindSpeed)] $INFO[Window.Property(Hourly.2.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.2.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.3.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.3.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.3.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.3.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.3.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.3.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.3.WindSpeed)] $INFO[Window.Property(Hourly.3.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.3.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.4.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.4.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.4.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.4.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.4.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.4.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.4.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.4.WindSpeed)] $INFO[Window.Property(Hourly.4.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.4.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.5.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.5.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.5.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.5.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.5.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.5.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.5.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.5.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.5.WindSpeed)] $INFO[Window.Property(Hourly.5.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.5.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.6.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.6.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.6.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.6.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.6.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.6.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.6.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.6.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.6.WindSpeed)] $INFO[Window.Property(Hourly.6.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.6.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.7.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.7.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.7.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.7.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.7.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.7.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.7.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.7.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.7.WindSpeed)] $INFO[Window.Property(Hourly.7.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.7.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.8.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.8.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.8.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.8.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.8.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.8.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.8.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.8.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.8.WindSpeed)] $INFO[Window.Property(Hourly.8.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.8.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.9.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.9.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.9.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.9.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.9.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.9.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.9.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.9.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.9.WindSpeed)] $INFO[Window.Property(Hourly.9.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.9.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.10.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.10.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.10.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.10.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.10.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.10.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.10.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.10.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.10.WindSpeed)] $INFO[Window.Property(Hourly.10.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.10.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.11.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.11.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.11.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.11.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.11.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.11.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.11.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.11.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.11.WindSpeed)] $INFO[Window.Property(Hourly.11.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.11.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.12.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.12.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.12.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.12.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.12.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.12.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.12.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.12.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.12.WindSpeed)] $INFO[Window.Property(Hourly.12.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.12.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.13.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.13.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.13.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.13.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.13.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.13.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.13.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.13.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.13.WindSpeed)] $INFO[Window.Property(Hourly.13.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.13.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.14.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.14.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.14.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.14.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.14.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.14.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.14.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.14.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.14.WindSpeed)] $INFO[Window.Property(Hourly.14.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.14.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.15.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.15.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.15.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.15.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.15.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.15.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.15.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.15.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.15.WindSpeed)] $INFO[Window.Property(Hourly.15.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.15.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.16.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.16.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.16.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.16.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.16.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.16.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.16.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.16.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.16.WindSpeed)] $INFO[Window.Property(Hourly.16.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.16.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.17.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.17.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.17.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.17.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.17.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.17.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.17.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.17.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.17.WindSpeed)] $INFO[Window.Property(Hourly.17.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.17.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.18.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.18.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.18.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.18.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.18.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.18.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.18.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.18.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.18.WindSpeed)] $INFO[Window.Property(Hourly.18.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.18.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.19.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.19.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.19.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.19.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.19.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.19.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.19.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.19.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.19.WindSpeed)] $INFO[Window.Property(Hourly.19.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.19.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.20.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.20.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.20.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.20.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.20.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.20.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.20.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.20.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.20.WindSpeed)] $INFO[Window.Property(Hourly.20.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.20.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.21.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.21.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.21.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.21.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.21.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.21.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.21.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.21.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.21.WindSpeed)] $INFO[Window.Property(Hourly.21.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.21.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.22.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.22.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.22.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.22.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.22.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.22.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.22.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.22.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.22.WindSpeed)] $INFO[Window.Property(Hourly.22.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.22.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.23.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.23.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.23.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.23.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.23.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.23.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.23.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.23.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.23.WindSpeed)] $INFO[Window.Property(Hourly.23.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.23.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+					<item>
+						<label>[B]$INFO[Window.Property(Hourly.24.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.24.ShortDate)][/COLOR]</label>
+						<label2>$INFO[Window.Property(Hourly.24.Temperature),[COLOR=grey2]$LOCALIZE[401] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.24.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.24.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.24.Precipitation),[COLOR=grey2]$LOCALIZE[1448] :[/COLOR][B] ,[/B]]</label2>
+						<thumb>$INFO[Window.Property(Hourly.24.OutlookIcon)]</thumb>
+						<icon>$INFO[Window.Property(Hourly.24.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.24.WindSpeed)] $INFO[Window.Property(Hourly.24.WindDirection)]</icon>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Hourly.24.Outlook)) + !IsEmpty(Window.Property(Hourly.IsFetched))</visible>
+					</item>
+				</content>
+			</control>
+			<control type="scrollbar" id="62">
+				<left>615</left>
+				<top>60</top>
+				<width>25</width>
+				<height>540</height>
+				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
+				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>ScrollBarNib.png</textureslidernib>
+				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
+				<onleft>52</onleft>
+				<onright>9000</onright>
+				<showonepage>true</showonepage>
+				<orientation>vertical</orientation>
+				<include>VisibleFadeEffect</include>
+				<visible>Control.IsVisible(52)</visible>
+			</control>
+			<control type="label">
+				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
+				<description>number of files/pages</description>
+				<right>40</right>
+				<top>627</top>
+				<width>570</width>
+				<font>font12</font>
+				<align>right</align>
+				<scroll>true</scroll>
+				<textcolor>grey</textcolor>
+				<shadowcolor>black</shadowcolor>
+				<label>([COLOR=blue]$INFO[Container(52).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(52).CurrentPage]/$INFO[Container(52).NumPages][/COLOR])</label>
+				<include>VisibleFadeEffect</include>
+				<visible>Control.IsVisible(52)</visible>
+			</control>
+		</control>
+	</include>
+	<include name="WeatherMaps">
+		<control type="group">
+			<visible>StringCompare(Window.Property(Weather.CurrentView),map) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="label">
+				<description>header label</description>
+				<left>20</left>
+				<top>15</top>
+				<width>610</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>31910</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="image">
+				<description>Background image</description>
+				<left>25</left>
+				<top>65</top>
+				<width>600</width>
+				<height>480</height>
+				<texture border="5">button-nofocus.png</texture>
+			</control>
+			<control type="button" id="992">
+				<left>580</left>
+				<top>565</top>
+				<width>25</width>
+				<height>25</height>
+				<label>-</label>
+				<texturefocus>scroll-right-focus.png</texturefocus>
+				<texturenofocus>scroll-right.png</texturenofocus>
+				<onleft>991</onleft>
+				<onright>9000</onright>
+				<onclick>Control.Move(53,1)</onclick>
+			</control>
+			<control type="button" id="991">
+				<left>45</left>
+				<top>565</top>
+				<width>25</width>
+				<height>25</height>
+				<label>-</label>
+				<texturefocus>scroll-left-focus.png</texturefocus>
+				<texturenofocus>scroll-left.png</texturenofocus>
+				<onleft>9000</onleft>
+				<onright>992</onright>
+				<onclick>Control.Move(53,-1)</onclick>
+			</control>
+			<control type="label">
+				<description>heading label</description>
+				<left>75</left>
+				<top>565</top>
+				<width>500</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$INFO[Container(53).ListItem.Label]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="list" id="53">
+				<left>30</left>
+				<top>70</top>
+				<width>590</width>
+				<height>470</height>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
+				<onup>9000</onup>
+				<ondown>9000</ondown>
+				<viewtype label="535">list</viewtype>
+				<scrolltime>200</scrolltime>
+				<orientation>horizontal</orientation>
+				<include>VisibleFadeEffect</include>
+				<visible>StringCompare(Window.Property(Weather.CurrentView),map) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+				<itemlayout height="470" width="590">
+					<control type="image">
+						<description>area image</description>
+						<left>0</left>
+						<top>0</top>
+						<width>590</width>
+						<height>470</height>
+						<texture>$INFO[ListItem.Icon]</texture>
+						<aspectratio>scale</aspectratio>
+					</control>
+					<control type="image">
+						<description>layer image</description>
+						<left>0</left>
+						<top>0</top>
+						<width>590</width>
+						<height>470</height>
+						<texture>$INFO[ListItem.Property(Layer)]</texture>
+						<aspectratio>scale</aspectratio>
+						<colordiffuse>70FFFFFF</colordiffuse>
+					</control>
+					<control type="image">
+						<description>legend image</description>
+						<left>360</left>
+						<top>430</top>
+						<width>224</width>
+						<height>35</height>
+						<texture>$INFO[ListItem.Label2]</texture>
+					</control>
+				</itemlayout>
+				<focusedlayout height="490" width="590">
+					<control type="image">
+						<description>layer image</description>
+						<left>0</left>
+						<top>0</top>
+						<width>590</width>
+						<height>470</height>
+						<texture>$INFO[ListItem.Icon]</texture>
+						<aspectratio>scale</aspectratio>
+					</control>
+					<control type="image">
+						<description>area image</description>
+						<left>0</left>
+						<top>0</top>
+						<width>590</width>
+						<height>470</height>
+						<texture>$INFO[ListItem.Property(Layer)]</texture>
+						<aspectratio>scale</aspectratio>
+						<colordiffuse>70FFFFFF</colordiffuse>
+					</control>
+					<control type="image">
+						<description>legend image</description>
+						<left>360</left>
+						<top>430</top>
+						<width>224</width>
+						<height>35</height>
+						<texture>$INFO[ListItem.Label2]</texture>
+					</control>
+				</focusedlayout>
+				<content>
+					<item>
+						<label>$INFO[Window.Property(Map.1.Heading)]</label>
+						<label2>$INFO[Window.Property(Map.1.Legend)]</label2>
+						<icon>$INFO[Window.Property(Map.1.Area)]</icon>
+						<property name="Layer">$INFO[Window.Property(Map.1.Layer)]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Map.1.Area)) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Map.2.Heading)]</label>
+						<label2>$INFO[Window.Property(Map.2.Legend)]</label2>
+						<icon>$INFO[Window.Property(Map.2.Area)]</icon>
+						<property name="Layer">$INFO[Window.Property(Map.2.Layer)]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Map.2.Area)) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Map.3.Heading)]</label>
+						<label2>$INFO[Window.Property(Map.3.Legend)]</label2>
+						<icon>$INFO[Window.Property(Map.3.Area)]</icon>
+						<property name="Layer">$INFO[Window.Property(Map.3.Layer)]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Map.3.Area)) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Map.4.Heading)]</label>
+						<label2>$INFO[Window.Property(Map.4.Legend)]</label2>
+						<icon>$INFO[Window.Property(Map.4.Area)]</icon>
+						<property name="Layer">$INFO[Window.Property(Map.4.Layer)]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Map.4.Area)) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+					</item>
+					<item>
+						<label>$INFO[Window.Property(Map.5.Heading)]</label>
+						<label2>$INFO[Window.Property(Map.5.Legend)]</label2>
+						<icon>$INFO[Window.Property(Map.5.Area)]</icon>
+						<property name="Layer">$INFO[Window.Property(Map.5.Layer)]</property>
+						<onclick>noop</onclick>
+						<visible>Weather.IsFetched + !IsEmpty(Window.Property(Map.5.Area)) + !IsEmpty(Window.Property(Map.IsFetched))</visible>
+					</item>
+				</content>
+			</control>
+			<control type="image">
+				<left>0</left>
+				<top>550</top>
+				<width>650</width>
+				<height>4</height>
+				<texture>separator.png</texture>
+			</control>
+		</control>
+	</include>
+	<include name="WeatherAlerts">
+		<control type="group">
+			<visible>StringCompare(Window.Property(Weather.CurrentView),alerts) + !(IsEmpty(Window.Property(Alerts.IsFetched)</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="button" id="996">
+				<description>Hidden Button for focus</description>
+				<left>-600</left>
+				<top>-20</top>
+				<width>1</width>
+				<height>1</height>
+				<texturenofocus>-</texturenofocus>
+				<texturefocus>-</texturefocus>
+				<onleft>9000</onleft>
+				<onright>9000</onright>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<left>20</left>
+				<top>15</top>
+				<width>610</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>33050</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>white</textcolor>
+				<shadowcolor>black</shadowcolor>
+			</control>
+			<control type="label">
+				<left>40</left>
+				<top>75</top>
+				<width>570</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<textcolor>blue</textcolor>
+				<align>center</align>
+				<aligny>center</aligny>
+				<label>$LOCALIZE[33050]</label>
+			</control>
+			<control type="group">
+				<visible>!StringCompare(Window.Property(Alerts.Count),0)</visible>
+				<control type="textbox">
+					<left>40</left>
+					<top>115</top>
+					<width>570</width>
+					<height>400</height>
+					<font>font12</font>
+					<textcolor>white</textcolor>
+					<selectedcolor>selected</selectedcolor>
+					<align>center</align>
+					<label>$INFO[Window.Property(Alerts)]</label>
+					<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
+				</control>
+			</control>
+			<control type="label">
+				<left>40</left>
+				<top>200</top>
+				<width>570</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<textcolor>white</textcolor>
+				<align>center</align>
+				<aligny>center</aligny>
+				<label>$LOCALIZE[19055]</label>
+				<visible>StringCompare(Window.Property(Alerts.Count),0)</visible>
+			</control>
+		</control>
+	</include>
+</includes>
diff --git a/addons/skin.confluence/720p/includes.xml b/addons/skin.confluence/720p/includes.xml
index b7e49042a9..6aa3350785 100644
--- a/addons/skin.confluence/720p/includes.xml
+++ b/addons/skin.confluence/720p/includes.xml
@@ -8,16 +8,12 @@
 	<include file="ViewsAddonBrowser.xml"/>
 	<include file="ViewsLiveTV.xml"/>
 	<include file="ViewsPVRGuide.xml"/>
+	<include file="ViewsWeather.xml"/>
 	<include file="IncludesCodecFlagging.xml"/>
 	<include file="IncludesHomeRecentlyAdded.xml"/>
 	<include file="IncludesHomeMenuItems.xml"/>
 	<include file="IncludesPVR.xml"/>
 	<include file="IncludesBackgroundBuilding.xml"/>
-	<include file="weather\10DayForecast.xml"/>
-	<include file="weather\36HourForecast.xml"/>
-	<include file="weather\WeekendForecast.xml"/>
-	<include file="weather\HourlyForecast.xml"/>
-	<include file="weather\MapAlerts.xml"/>
 
 	<constant name="FanartCrossfadeTime">500</constant>
 	<constant name="IconCrossfadeTime">400</constant>
diff --git a/addons/skin.confluence/720p/weather/10DayForecast.xml b/addons/skin.confluence/720p/weather/10DayForecast.xml
deleted file mode 100644
index e0edfb2119..0000000000
--- a/addons/skin.confluence/720p/weather/10DayForecast.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<include name="Weather10DayForcast">
-		<control type="group">
-			<visible>IsEmpty(Window.Property(Weather.CurrentView))</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="label">
-				<description>header label</description>
-				<left>20</left>
-				<top>15</top>
-				<width>610</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>31904</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="list" id="51">
-				<left>15</left>
-				<top>60</top>
-				<width>600</width>
-				<height>541</height>
-				<onleft>9000</onleft>
-				<onright>61</onright>
-				<onup>51</onup>
-				<ondown>51</ondown>
-				<viewtype label="535">list</viewtype>
-				<pagecontrol>61</pagecontrol>
-				<scrolltime>200</scrolltime>
-				<itemlayout height="135" width="600">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>600</width>
-						<height>136</height>
-						<texture border="0,5,0,5">MenuItemNF.png</texture>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>0</top>
-						<width>100</width>
-						<height>120</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-					</control>
-					<control type="image">
-						<left>110</left>
-						<top>5</top>
-						<width>80</width>
-						<height>80</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[ListItem.Thumb]</texture>
-					</control>
-					<control type="label">
-						<left>200</left>
-						<top>0</top>
-						<width>390</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label2]</label>
-					</control>
-					<control type="textbox">
-						<left>5</left>
-						<top>80</top>
-						<width>590</width>
-						<height>50</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[ListItem.ActualIcon]</label>
-					</control>
-				</itemlayout>
-				<focusedlayout height="135" width="600">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>600</width>
-						<height>136</height>
-						<texture border="0,2,0,2">MenuItemNF.png</texture>
-						<visible>!Control.HasFocus(51)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>600</width>
-						<height>136</height>
-						<texture border="10">button-focus2.png</texture>
-						<visible>Control.HasFocus(51)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>0</top>
-						<width>100</width>
-						<height>120</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-					</control>
-					<control type="image">
-						<left>110</left>
-						<top>5</top>
-						<width>80</width>
-						<height>80</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[ListItem.Thumb]</texture>
-					</control>
-					<control type="label">
-						<left>200</left>
-						<top>0</top>
-						<width>390</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label2]</label>
-					</control>
-					<control type="textbox">
-						<left>5</left>
-						<top>80</top>
-						<width>590</width>
-						<height>50</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[ListItem.ActualIcon]</label>
-					</control>
-				</focusedlayout>
-				<content>
-					<item>
-						<icon>$LOCALIZE[31909]</icon>
-						<onclick>noop</onclick>
-						<visible>IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.1.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.1.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.1.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.1.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.1.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.1.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.1.WindSpeed)] $INFO[Window.Property(Daily.1.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.2.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.2.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.2.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.2.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.2.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.2.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.2.WindSpeed)] $INFO[Window.Property(Daily.2.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.3.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.3.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.3.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.3.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.3.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.3.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.3.WindSpeed)] $INFO[Window.Property(Daily.3.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.4.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.4.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.4.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.4.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.4.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.4.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.4.WindSpeed)] $INFO[Window.Property(Daily.4.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.5.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.5.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.5.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.5.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.5.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.5.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.5.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.5.WindSpeed)] $INFO[Window.Property(Daily.5.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.6.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.6.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.6.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.6.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.6.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.6.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.6.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.6.WindSpeed)] $INFO[Window.Property(Daily.6.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.7.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.7.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.7.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.7.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.7.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.7.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.7.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.7.WindSpeed)] $INFO[Window.Property(Daily.7.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.8.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.8.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.8.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.8.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.8.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.8.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.8.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.8.WindSpeed)] $INFO[Window.Property(Daily.8.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.9.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.9.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.9.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.9.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.9.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.9.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.9.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.9.WindSpeed)] $INFO[Window.Property(Daily.9.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Daily.10.ShortDay)][/B][CR][COLOR=grey2]$INFO[Window.Property(Daily.10.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Daily.10.HighTemperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Daily.10.LowTemperature),[COLOR=grey2]$LOCALIZE[418] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Daily.10.Precipitation),[COLOR=grey2]$LOCALIZE[33022] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Daily.10.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Daily.10.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Daily.10.WindSpeed)] $INFO[Window.Property(Daily.10.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Daily.IsFetched))</visible>
-					</item>
-				</content>
-			</control>
-			<control type="scrollbar" id="61">
-				<left>615</left>
-				<top>60</top>
-				<width>25</width>
-				<height>540</height>
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-				<textureslidernib>ScrollBarNib.png</textureslidernib>
-				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-				<onleft>51</onleft>
-				<onright>9000</onright>
-				<showonepage>true</showonepage>
-				<orientation>vertical</orientation>
-				<visible>Control.IsVisible(50)</visible>
-			</control>
-			<control type="label">
-				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
-				<description>number of files/pages</description>
-				<right>40</right>
-				<top>627</top>
-				<width>570</width>
-				<font>font12</font>
-				<align>right</align>
-				<scroll>true</scroll>
-				<textcolor>grey</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<label>([COLOR=blue]$INFO[Container(51).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(51).CurrentPage]/$INFO[Container(51).NumPages][/COLOR])</label>
-			</control>
-		</control>
-	</include>
-</includes>
diff --git a/addons/skin.confluence/720p/weather/36HourForecast.xml b/addons/skin.confluence/720p/weather/36HourForecast.xml
deleted file mode 100644
index ff5a5e14b1..0000000000
--- a/addons/skin.confluence/720p/weather/36HourForecast.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<include name="Weather36HourForcast">
-		<control type="group">
-			<visible>StringCompare(Window.Property(Weather.CurrentView),36hour)</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="button" id="997">
-				<description>Hidden Button for focus</description>
-				<left>-600</left>
-				<top>-20</top>
-				<width>1</width>
-				<height>1</height>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-			</control>
-			<control type="label">
-				<description>header label</description>
-				<left>20</left>
-				<top>15</top>
-				<width>610</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>31901</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<left>0</left>
-				<top>200</top>
-				<width>600</width>
-				<height>30</height>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$LOCALIZE[31909]</label>
-				<visible>IsEmpty(Window.Property(36Hour.IsFetched))</visible>
-			</control>
-			<control type="group">
-				<left>20</left>
-				<top>50</top>
-				<visible>!IsEmpty(Window.Property(36Hour.IsFetched))</visible>
-				<include>VisibleFadeEffect</include>
-				<control type="group">
-					<left>0</left>
-					<top>0</top>
-					<control type="label">
-						<left>0</left>
-						<top>5</top>
-						<width>600</width>
-						<height>30</height>
-						<font>font13_title</font>
-						<textcolor>blue</textcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(36Hour.1.Heading)]</label>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>10</top>
-						<width>120</width>
-						<height>110</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[Window.Property(36Hour.1.OutlookIcon)]</texture>
-					</control>
-					<control type="label">
-						<left>120</left>
-						<top>40</top>
-						<width>100</width>
-						<height>40</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.1.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.1.Temperature),[B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<right>90</right>
-						<top>60</top>
-						<width>390</width>
-						<height>20</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(36Hour.1.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label>
-					</control>
-					<control type="textbox">
-						<left>0</left>
-						<top>110</top>
-						<width>590</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[Window.Property(36hour.1.Forecast),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>180</top>
-						<width>650</width>
-						<height>4</height>
-						<texture>separator.png</texture>
-					</control>
-				</control>
-				<control type="group">
-					<left>0</left>
-					<top>185</top>
-					<control type="label">
-						<left>0</left>
-						<top>5</top>
-						<width>600</width>
-						<height>30</height>
-						<font>font13_title</font>
-						<textcolor>blue</textcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(36Hour.2.Heading)]</label>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>10</top>
-						<width>120</width>
-						<height>110</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[Window.Property(36Hour.2.OutlookIcon)]</texture>
-					</control>
-					<control type="label">
-						<left>120</left>
-						<top>40</top>
-						<width>100</width>
-						<height>40</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.2.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.2.Temperature),[B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<right>90</right>
-						<top>60</top>
-						<width>390</width>
-						<height>20</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(36Hour.2.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label>
-					</control>
-					<control type="textbox">
-						<left>0</left>
-						<top>110</top>
-						<width>590</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[Window.Property(36hour.2.Forecast),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>180</top>
-						<width>650</width>
-						<height>4</height>
-						<texture>separator.png</texture>
-					</control>
-				</control>
-				<control type="group">
-					<left>0</left>
-					<top>370</top>
-					<control type="label">
-						<left>0</left>
-						<top>5</top>
-						<width>600</width>
-						<height>30</height>
-						<font>font13_title</font>
-						<textcolor>blue</textcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(36Hour.3.Heading)]</label>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>10</top>
-						<width>120</width>
-						<height>110</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[Window.Property(36Hour.3.OutlookIcon)]</texture>
-					</control>
-					<control type="label">
-						<left>120</left>
-						<top>40</top>
-						<width>100</width>
-						<height>40</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$INFO[Window.Property(36Hour.3.TemperatureHeading)][CR][/COLOR]$INFO[Window.Property(36Hour.3.Temperature),[B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<right>90</right>
-						<top>60</top>
-						<width>390</width>
-						<height>20</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(36Hour.3.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label>
-					</control>
-					<control type="textbox">
-						<left>0</left>
-						<top>110</top>
-						<width>590</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[Window.Property(36hour.3.Forecast),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]]</label>
-					</control>
-				</control>
-			</control>
-		</control>
-	</include>
-</includes>
diff --git a/addons/skin.confluence/720p/weather/HourlyForecast.xml b/addons/skin.confluence/720p/weather/HourlyForecast.xml
deleted file mode 100644
index 526648ed70..0000000000
--- a/addons/skin.confluence/720p/weather/HourlyForecast.xml
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<include name="WeatherHourlyForcast">
-		<control type="group">
-			<visible>StringCompare(Window.Property(Weather.CurrentView),hourly)</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="label">
-				<description>header label</description>
-				<left>20</left>
-				<top>15</top>
-				<width>610</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>31902</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="list" id="52">
-				<left>15</left>
-				<top>60</top>
-				<width>600</width>
-				<height>541</height>
-				<onleft>9000</onleft>
-				<onright>62</onright>
-				<onup>52</onup>
-				<ondown>52</ondown>
-				<viewtype label="535">list</viewtype>
-				<pagecontrol>62</pagecontrol>
-				<scrolltime>200</scrolltime>
-				<itemlayout height="135" width="600">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>600</width>
-						<height>136</height>
-						<texture border="0,5,0,5">MenuItemNF.png</texture>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>0</top>
-						<width>100</width>
-						<height>120</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-					</control>
-					<control type="image">
-						<left>110</left>
-						<top>5</top>
-						<width>80</width>
-						<height>80</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[ListItem.Thumb]</texture>
-					</control>
-					<control type="label">
-						<left>200</left>
-						<top>5</top>
-						<width>390</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label2]</label>
-					</control>
-					<control type="textbox">
-						<left>5</left>
-						<top>80</top>
-						<width>590</width>
-						<height>50</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[ListItem.ActualIcon]</label>
-					</control>
-				</itemlayout>
-				<focusedlayout height="135" width="600">
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>600</width>
-						<height>136</height>
-						<texture border="0,2,0,2">MenuItemNF.png</texture>
-						<visible>!Control.HasFocus(52)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>0</top>
-						<width>600</width>
-						<height>136</height>
-						<texture border="10">button-focus2.png</texture>
-						<visible>Control.HasFocus(52)</visible>
-						<include>VisibleFadeEffect</include>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>0</top>
-						<width>100</width>
-						<height>120</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label]</label>
-					</control>
-					<control type="image">
-						<left>110</left>
-						<top>5</top>
-						<width>80</width>
-						<height>80</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[ListItem.Thumb]</texture>
-					</control>
-					<control type="label">
-						<left>200</left>
-						<top>5</top>
-						<width>390</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<aligny>center</aligny>
-						<label>$INFO[ListItem.Label2]</label>
-					</control>
-					<control type="textbox">
-						<left>5</left>
-						<top>80</top>
-						<width>590</width>
-						<height>50</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[ListItem.ActualIcon]</label>
-					</control>
-				</focusedlayout>
-				<content>
-					<item>
-						<icon>$LOCALIZE[31909]</icon>
-						<onclick>noop</onclick>
-						<visible>IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.1.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.1.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.1.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.1.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.1.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.1.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.1.WindSpeed)] $INFO[Window.Property(Hourly.1.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.2.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.2.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.2.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.2.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.2.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.2.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.2.WindSpeed)] $INFO[Window.Property(Hourly.2.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.3.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.3.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.3.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.3.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.3.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.3.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.3.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.3.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.3.WindSpeed)] $INFO[Window.Property(Hourly.3.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.4.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.4.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.4.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.4.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.4.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.4.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.4.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.4.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.4.WindSpeed)] $INFO[Window.Property(Hourly.4.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.5.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.5.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.5.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.5.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.5.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.5.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.5.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.5.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.5.WindSpeed)] $INFO[Window.Property(Hourly.5.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.6.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.6.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.6.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.6.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.6.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.6.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.6.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.6.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.6.WindSpeed)] $INFO[Window.Property(Hourly.6.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.7.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.7.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.7.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.7.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.7.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.7.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.7.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.7.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.7.WindSpeed)] $INFO[Window.Property(Hourly.7.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.8.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.8.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.8.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.8.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.8.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.8.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.8.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.8.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.8.WindSpeed)] $INFO[Window.Property(Hourly.8.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.9.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.9.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.9.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.9.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.9.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.9.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.9.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.9.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.9.WindSpeed)] $INFO[Window.Property(Hourly.9.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.10.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.10.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.10.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.10.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.10.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.10.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.10.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.10.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.10.WindSpeed)] $INFO[Window.Property(Hourly.10.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.11.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.11.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.11.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.11.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.11.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.11.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.11.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.11.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.11.WindSpeed)] $INFO[Window.Property(Hourly.11.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-					<item>
-						<label>[B]$INFO[Window.Property(Hourly.12.Time)][/B][CR][COLOR=grey2]$INFO[Window.Property(Hourly.12.ShortDate)][/COLOR]</label>
-						<label2>$INFO[Window.Property(Hourly.12.Temperature),[COLOR=grey2]$LOCALIZE[419] :[/COLOR][B] ,[/B]]  $INFO[Window.Property(Hourly.12.FeelsLike),[COLOR=grey2]$LOCALIZE[402] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.12.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR]$INFO[Window.Property(Hourly.12.ChancePrecipitation),[COLOR=grey2]$LOCALIZE[31908] :[/COLOR][B] ,[/B]]</label2>
-						<thumb>$INFO[Window.Property(Hourly.12.OutlookIcon)]</thumb>
-						<icon>$INFO[Window.Property(Hourly.12.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]][CR][COLOR=grey2]$LOCALIZE[383]: [/COLOR]$INFO[Window.Property(Hourly.12.WindSpeed)] $INFO[Window.Property(Hourly.12.WindDirection)]</icon>
-						<onclick>noop</onclick>
-						<visible>!IsEmpty(Window.Property(Hourly.IsFetched))</visible>
-					</item>
-				</content>
-			</control>
-			<control type="scrollbar" id="62">
-				<left>615</left>
-				<top>60</top>
-				<width>25</width>
-				<height>540</height>
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-				<textureslidernib>ScrollBarNib.png</textureslidernib>
-				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-				<onleft>52</onleft>
-				<onright>9000</onright>
-				<showonepage>true</showonepage>
-				<orientation>vertical</orientation>
-				<visible>Control.IsVisible(50)</visible>
-			</control>
-			<control type="label">
-				<animation effect="slide" start="0,0" end="-90,0" time="0" condition="system.getbool(input.enablemouse)">Conditional</animation>
-				<description>number of files/pages</description>
-				<right>40</right>
-				<top>627</top>
-				<width>570</width>
-				<font>font12</font>
-				<align>right</align>
-				<scroll>true</scroll>
-				<textcolor>grey</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<label>([COLOR=blue]$INFO[Container(52).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(52).CurrentPage]/$INFO[Container(52).NumPages][/COLOR])</label>
-			</control>
-		</control>
-	</include>
-</includes>
diff --git a/addons/skin.confluence/720p/weather/MapAlerts.xml b/addons/skin.confluence/720p/weather/MapAlerts.xml
deleted file mode 100644
index f49e74142d..0000000000
--- a/addons/skin.confluence/720p/weather/MapAlerts.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<include name="WeatherMapAlerts">
-		<control type="group">
-			<visible>StringCompare(Window.Property(Weather.CurrentView),map)</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="button" id="999">
-				<description>Hidden Button for focus</description>
-				<left>-600</left>
-				<top>-20</top>
-				<width>1</width>
-				<height>1</height>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-			</control>
-			<control type="label">
-				<description>header label</description>
-				<left>20</left>
-				<top>15</top>
-				<width>610</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>31910</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="image">
-				<description>Background image</description>
-				<left>40</left>
-				<top>75</top>
-				<width>570</width>
-				<height>325</height>
-				<texture border="5">button-nofocus.png</texture>
-			</control>
-			<control type="multiimage">
-				<description>map multiimage</description>
-				<left>45</left>
-				<top>80</top>
-				<width>560</width>
-				<height>315</height>
-				<imagepath>$INFO[Window.Property(MapPath)]</imagepath>
-				<timeperimage>500</timeperimage>
-				<pauseatend>1000</pauseatend>
-				<fadetime>0</fadetime>
-				<randomize>false</randomize>
-				<loop>yes</loop>
-				<aspectratio>keep</aspectratio>
-				<aligny>center</aligny>
-			</control>
-			<control type="image">
-				<left>0</left>
-				<top>410</top>
-				<width>650</width>
-				<height>4</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="label">
-				<left>40</left>
-				<top>430</top>
-				<width>570</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$LOCALIZE[33050]</label>
-			</control>
-			<control type="group">
-				<visible>!StringCompare(Window.Property(Alerts.Count),0)</visible>
-				<control type="textbox">
-					<left>40</left>
-					<top>470</top>
-					<width>570</width>
-					<height>100</height>
-					<font>font12</font>
-					<textcolor>white</textcolor>
-					<selectedcolor>selected</selectedcolor>
-					<align>center</align>
-					<label>$INFO[Window.Property(Alerts)]</label>
-					<autoscroll time="2000" delay="3000" repeat="5000">Skin.HasSetting(AutoScroll)</autoscroll>
-				</control>
-			</control>
-			<control type="label">
-				<left>40</left>
-				<top>500</top>
-				<width>570</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$LOCALIZE[19055]</label>
-				<visible>StringCompare(Window.Property(Alerts.Count),0)</visible>
-			</control>
-		</control>
-	</include>
-</includes>
diff --git a/addons/skin.confluence/720p/weather/WeekendForecast.xml b/addons/skin.confluence/720p/weather/WeekendForecast.xml
deleted file mode 100644
index 750a39e386..0000000000
--- a/addons/skin.confluence/720p/weather/WeekendForecast.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<include name="WeatherWeekendForcast">
-		<control type="group">
-			<visible>StringCompare(Window.Property(Weather.CurrentView),weekend)</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="button" id="998">
-				<description>Hidden Button for focus</description>
-				<left>-600</left>
-				<top>-20</top>
-				<width>1</width>
-				<height>1</height>
-				<texturenofocus>-</texturenofocus>
-				<texturefocus>-</texturefocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-			</control>
-			<control type="label">
-				<description>header label</description>
-				<left>20</left>
-				<top>15</top>
-				<width>610</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>31903</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label">
-				<left>0</left>
-				<top>200</top>
-				<width>600</width>
-				<height>30</height>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<align>center</align>
-				<aligny>center</aligny>
-				<label>$LOCALIZE[31909]</label>
-				<visible>IsEmpty(Window.Property(Weekend.IsFetched))</visible>
-			</control>
-			<control type="group">
-				<left>20</left>
-				<top>50</top>
-				<visible>!IsEmpty(Window.Property(Weekend.IsFetched))</visible>
-				<include>VisibleFadeEffect</include>
-				<control type="group">
-					<left>0</left>
-					<top>0</top>
-					<control type="label">
-						<left>0</left>
-						<top>5</top>
-						<width>600</width>
-						<height>30</height>
-						<font>font13_title</font>
-						<textcolor>blue</textcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(Weekend.1.LongDay)] - $INFO[Window.Property(Weekend.1.ShortDate)]</label>
-					</control>
-					<control type="image">
-						<left>10</left>
-						<top>20</top>
-						<width>130</width>
-						<height>160</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[Window.Property(Weekend.1.OutlookIcon)]</texture>
-					</control>
-					<control type="label">
-						<left>140</left>
-						<top>40</top>
-						<width>100</width>
-						<height>50</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.1.HighTemperature),[B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<left>140</left>
-						<top>100</top>
-						<width>100</width>
-						<height>50</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.1.LowTemperature),[B] ,[/B]]</label>
-					</control>
-					<control type="textbox">
-						<left>240</left>
-						<top>40</top>
-						<width>350</width>
-						<height>130</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<align>right</align>
-						<label>$INFO[Window.Property(Weekend.1.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.1.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.1.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>170</top>
-						<width>590</width>
-						<height>20</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(Weekend.1.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label>
-					</control>
-					<control type="textbox">
-						<left>0</left>
-						<top>210</top>
-						<width>590</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[Window.Property(Weekend.1.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label>
-					</control>
-					<control type="image">
-						<left>0</left>
-						<top>270</top>
-						<width>650</width>
-						<height>4</height>
-						<texture>separator.png</texture>
-					</control>
-				</control>
-				<control type="group">
-					<left>0</left>
-					<top>280</top>
-					<control type="label">
-						<left>0</left>
-						<top>5</top>
-						<width>600</width>
-						<height>30</height>
-						<font>font13_title</font>
-						<textcolor>blue</textcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(Weekend.2.LongDay)] - $INFO[Window.Property(Weekend.2.ShortDate)]</label>
-					</control>
-					<control type="image">
-						<left>10</left>
-						<top>20</top>
-						<width>130</width>
-						<height>160</height>
-						<aspectratio>keep</aspectratio>
-						<texture>$INFO[Window.Property(Weekend.2.OutlookIcon)]</texture>
-					</control>
-					<control type="label">
-						<left>140</left>
-						<top>40</top>
-						<width>100</width>
-						<height>50</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$LOCALIZE[393][CR][/COLOR]$INFO[Window.Property(Weekend.2.HighTemperature),[B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<left>140</left>
-						<top>100</top>
-						<width>100</width>
-						<height>50</height>
-						<font>font13_title</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>[COLOR=grey2]$LOCALIZE[391][CR][/COLOR]$INFO[Window.Property(Weekend.2.LowTemperature),[B] ,[/B]]</label>
-					</control>
-					<control type="textbox">
-						<left>240</left>
-						<top>40</top>
-						<width>350</width>
-						<height>130</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<align>right</align>
-						<label>$INFO[Window.Property(Weekend.2.Humidity),[COLOR=grey2]$LOCALIZE[406] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.ShortWindDirection),[COLOR=grey2]$LOCALIZE[404] :[/COLOR][B] ,[/B]][CR][CR]$INFO[Window.Property(Weekend.2.Precipitation),[COLOR=grey2]$LOCALIZE[33021] :[/COLOR][B] ,[/B]]</label>
-					</control>
-					<control type="label">
-						<left>0</left>
-						<top>170</top>
-						<width>590</width>
-						<height>20</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<aligny>center</aligny>
-						<label>$INFO[Window.Property(Weekend.2.Outlook),[COLOR=grey2]$LOCALIZE[33030]: [/COLOR]]</label>
-					</control>
-					<control type="textbox">
-						<left>0</left>
-						<top>210</top>
-						<width>590</width>
-						<height>70</height>
-						<font>font12</font>
-						<textcolor>white</textcolor>
-						<selectedcolor>selected</selectedcolor>
-						<align>center</align>
-						<label>$INFO[Window.Property(Weekend.2.LongOutlookDay),[COLOR=grey2]$LOCALIZE[31905]: [/COLOR]][CR]</label>
-					</control>
-				</control>
-			</control>
-		</control>
-	</include>
-</includes>
diff --git a/addons/skin.confluence/language/English/strings.po b/addons/skin.confluence/language/English/strings.po
index 129410572c..8bfbd35096 100644
--- a/addons/skin.confluence/language/English/strings.po
+++ b/addons/skin.confluence/language/English/strings.po
@@ -631,7 +631,7 @@ msgid "Weekend Forecast"
 msgstr ""
 
 msgctxt "#31904"
-msgid "10 Day Forecast"
+msgid "Daily Forecast"
 msgstr ""
 
 msgctxt "#31905"
@@ -649,7 +649,7 @@ msgid "Fetching forecast info..."
 msgstr ""
 
 msgctxt "#31910"
-msgid "Map & Alerts"
+msgid "Maps"
 msgstr ""
 
 #empty strings from id 31911 to 31949