diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 50f8528..026a34c 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -89,6 +89,14 @@
             <onclick>xbmc.mastermode</onclick>
             <selected>system.ismaster</selected>
             <visible>system.haslocks</visible>
+        </control>
+		<control type="button" id="13">
+            <description>Edit video menu</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>12-col</width>
+            <label>31172</label>
+            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=videosubmenu)</onclick>
         </control>
     </include>
     <!--music submenu items-->
@@ -170,6 +178,14 @@
             <label>191</label>
             <onclick condition="!Playlist.IsRandom">PlayerControl(randomOn)</onclick>
             <onclick condition="Playlist.IsRandom">PlayerControl(randomOff)</onclick>
+        </control>
+		<control type="button" id="14">
+            <description>Edit music menu</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>12-col</width>
+            <label>31173</label>
+            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=musicsubmenu)</onclick>
         </control>
     </include>
     <!--pictures submenu items-->
@@ -194,6 +210,14 @@
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
             <alttexturefocus colordiffuse="highlight">colors/white.png</alttexturefocus>
             <onclick>sendclick(pictures,4)</onclick>
+        </control>
+		<control type="button" id="17">
+            <description>Edit pictures menu</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>12-col</width>
+            <label>31174</label>
+            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=picturessubmenu)</onclick>
         </control>
     </include>
     <!--pictures submenu items-->
@@ -249,6 +273,14 @@
             <altlabel>31110</altlabel>
             <width>12-col</width>
             <onclick>sendclick(games,4)</onclick>
+        </control>
+		<control type="button" id="17">
+            <description>Edit Games menu</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>12-col</width>
+            <label>31233</label>
+            <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=gamesubmenu)</onclick>
         </control>
 	</include>
 </includes>
\ No newline at end of file
diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml
index 0348464..c9ff667 100644
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@@ -1,5 +1,170 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-	<!--unused-->
-    <onload>back</onload>
+    <defaultcontrol always="true">100</defaultcontrol>
+    <include>fadeInOut</include>
+    <controls>
+        <!--background-->
+        <include>globalBackground</include>
+		<!--page header-->
+        <control type="group">
+			<include>pageHeader</include>    
+        </control>
+        <control type="group">
+            <posx>col-1-begin</posx>
+            <posy>row-5-begin</posy>
+            <!--today-->
+            <control type="group">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>24-col</width>
+                    <height>2-row</height>
+                    <font>veryLarge</font>
+                    <label>$INFO[Window.Property(Location)]</label>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor></shadowcolor>
+                </control>
+                <control type="group">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>3-row</posy>
+                        <width>21-col</width>
+                        <height>2-row</height>
+                        <font>largeTitle</font>
+                        <label>$INFO[Window.Property(Day0.Outlook)]</label>
+                        <textcolor>highlight</textcolor>
+                        <shadowcolor></shadowcolor>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>6-row</posy>
+                        <width>21-col</width>
+                        <height>2-row</height>
+                        <font>large</font>
+                        <label>$INFO[Window.Property(Current.Temperature)]$INFO[System.TemperatureUnits] ($INFO[Window.Property(Current.FeelsLike)]$INFO[System.TemperatureUnits]), $INFO[Window.Property(current.condition)]</label>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor></shadowcolor>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>8-row</posy>
+                        <width>12-col</width>
+                        <height>2-row</height>
+                        <font>regular</font>
+                        <label>$LOCALIZE[13508]: [B]$INFO[Window.Property(Day0.HighTemp)]$INFO[System.TemperatureUnits][/B]     $LOCALIZE[418]: [B]$INFO[Window.Property(Day0.LowTemp)]$INFO[System.TemperatureUnits][/B]     $LOCALIZE[406]: [B]$INFO[Window.Property(Current.Humidity)][/B]</label>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor></shadowcolor>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>336</posy>
+                        <width>12-col</width>
+                        <height>2-row</height>
+                        <font>regular</font>
+                        <label>$LOCALIZE[383]: $INFO[Window.Property(Current.wind)]</label>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor></shadowcolor>
+                    </control>
+                </control>
+            </control>
+
+            <!--remaining forecast begins-->
+            <control type="group">
+                <control type="panel" id="9000">
+                    <posx>0</posx>
+                    <posy>15-row</posy>
+                    <width>24-col</width>
+                    <height>24-row</height>
+                    <itemlayout width="6-col" height="4-row">
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>-24</posy>
+                            <width>6-col-gutter</width>
+                            <height>2-row</height>
+                            <font>dialogTitle</font>
+                            <label>$INFO[ListItem.Label]</label>
+                            <textcolor>textActive</textcolor>
+                            <shadowcolor></shadowcolor>
+                        </control>
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>18</posy>
+                            <width>6-col-gutter</width>
+                            <height>2-row</height>
+                            <font>itemSubTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <autoscroll delay="3000" time="1000" repeat="3000"/>
+                            <label>$INFO[ListItem.Property(Outlook)]</label>
+                        </control>
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>76</posy>
+                            <width>6-col-gutter</width>
+                            <height>1-row</height>
+                            <font>itemSubTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$LOCALIZE[13508] [B]$INFO[ListItem.Property(HighTemp)] $INFO[ListItem.Property(TempUnits)][/B]  $LOCALIZE[418] [B]$INFO[ListItem.Property(LowTemp)] $INFO[ListItem.Property(TempUnits)][/B]</label>
+                        </control>
+                    </itemlayout>
+                    <focusedlayout/>
+                    <content>
+                        <item id="2">
+                            <description>Day 1</description>
+                            <label>$INFO[Window.Property(Day1.Title)]</label>
+                            <property name="fanartCode">$INFO[Window.Property(Day1.fanartCode)]</property>
+                            <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>
+                        </item>
+                        <item id="3">
+                            <description>Day 2</description>
+                            <label>$INFO[Window.Property(Day2.Title)]</label>
+                            <property name="fanartCode">$INFO[Window.Property(Day2.fanartCode)]</property>
+                            <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>
+                        </item>
+                        <item id="4">
+                            <description>Day 3</description>
+                            <label>$INFO[Window.Property(Day3.Title)]</label>
+                            <property name="fanartCode">$INFO[Window.Property(Day3.fanartCode)]</property>
+                            <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>
+                        </item>
+                        <item id="5">
+                            <description>Day 4</description>
+                            <label>$INFO[Window.Property(Day4.Title)]</label>
+                            <property name="fanartCode">$INFO[Window.Property(Day4.fanartCode)]</property>
+                            <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>
+                        </item>
+                    </content>
+                </control>
+                <!--panel ends-->
+            </control>
+        </control>
+        <!--location control-->
+        <control type="button" id="100">
+            <description>change location button</description>
+            <left>-100</left>
+            <top>-100</top>
+            <width>6-col</width>
+            <onright>Weather.LocationNext</onright>
+            <onleft>Weather.LocationPrevious</onleft>
+        </control>
+        <!--debugging-->
+        <include>DebugGrid</include>
+        <control type="label">
+            <include>WindowID</include>
+            <label>MyWeather.xml</label>
+        </control>
+    </controls>
 </window>
\ No newline at end of file
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index b64eca8..61b5a84 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -524,3 +524,4 @@ msgstr ""
 msgctxt "#31251"
 msgid "Eject Disc"
 msgstr ""
+