diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index fc19b63..96f3b83 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -92,10 +92,10 @@
                 <control type="label">
                     <posx>12</posx>
                     <posy>2-row</posy>
-                    <width>10-col-gutter</width>
-                    <font>itemSubTitle</font>
+                    <width>12-col-gutter</width>
+                    <font>small</font>
                     <textcolor>highlight</textcolor>
-                    <label>$INFO[ListItem.Property(Addon.Creator)] • $LOCALIZE[31082] $INFO[ListItem.Property(Addon.Version)]</label>
+                    <label>[B]$LOCALIZE[31082] $INFO[ListItem.Property(Addon.Version)][/B] $INFO[ListItem.Property(Addon.Creator)] </label>
                 </control>
                 <control type="textbox" id="400">
                     <posx>12</posx>
diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml
index b7f9df2..bdfc93b 100644
--- a/1080i/DialogPVRChannelManager.xml
+++ b/1080i/DialogPVRChannelManager.xml
@@ -1,139 +1,136 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol always="true">20</defaultcontrol>
-    
-    <coordinates>
-        <system>1</system>
-        <posx>0</posx>
-        <posy>0</posy>
-    </coordinates>
+
     <controls>
         <!--background-->
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>ffffffff</colordiffuse>
-        </control>
         <include>globalBackground</include>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>99ffffff</colordiffuse>
-        </control>
         <control type="group">
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="group">
-                <posx>col-4-begin</posx>
+                <posx>col-2-begin</posx>
                 <posy>row-3-begin</posy>
+                <!--animations-->
+                <include>modalDialogInOutVertical</include>
                 <control type="image">
-                    <posx>-312</posx>
-                    <posy>44</posy>
-                    <width>fullscreenWidth</width>
-                    <height>1-row</height>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>22-col</width>
+                    <height>2-row</height>
                     <texture>colors/white.png</texture>
-                    <colordiffuse>ffffffff</colordiffuse>
+                    <colordiffuse>highlight</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="image">
-                    <posx>-3</posx>
-                    <posy>44</posy>
-                    <width>1155</width>
-                    <height>1-row</height>
-                    <texture>colors/white.png</texture>
-                    <bordertexture border="0">colors/black.png</bordertexture>
-                    <bordersize>3,0,0,0</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
+                    <posx>0</posx>
+                    <posy>2-row</posy>
+                    <width>22-col</width>
+                    <height>21-row</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
+                <control type="image">
+                    <posx>8-col</posx>
+                    <posy>2-row</posy>
+                    <width>14-col</width>
+                    <height>21-row</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="label">
                     <visible>IsEmpty(Window.Property(IsRadio))</visible>
-                    <posx>12</posx>
-                    <posy>44</posy>
+                    <posx>24</posx>
+                    <posy>0</posy>
                     <width>16-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
                     <font>dialogTitle</font>
                     <label>$LOCALIZE[19199] - $LOCALIZE[19023]</label>
-                    <textcolor>black</textcolor>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <control type="label">
                     <visible>!IsEmpty(Window.Property(IsRadio))</visible>
-                    <posx>12</posx>
-                    <posy>44</posy>
+                    <posx>24</posx>
+                    <posy>0</posy>
                     <width>16-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
                     <font>dialogTitle</font>
                     <label>$LOCALIZE[19199] - $LOCALIZE[19024]</label>
-                    <textcolor>black</textcolor>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
+
                 <!--channel list-->
                 <control type="list" id="20">
                     <posx>0</posx>
                     <posy>2-row</posy>
                     <width>8-col</width>
-                    <height>11-row</height>
+                    <height>21-row</height>
                     <onright>7</onright>
-                    <itemlayout height="1-row" width="8-col-gutter">
+                    <itemlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>8-col-gutter</width>
-                            <height>53</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>99FFFFFF</colordiffuse>
-                        </control>
-                        <control type="image">
-                            <posx>4</posx>
-                            <posy>4</posy>
-                            <width>48</width>
-                            <height>48</height>
-                            <aspectratio scalediffuse="false">scale</aspectratio>
-                            <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
-                            <font>itemTitle</font>
+                            <width>7-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.Property(Number),(,) - ]$INFO[ListItem.Property(Name)]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout height="1-row" width="8-col-gutter">
+                    <focusedlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>8-col-gutter</width>
-                            <height>53</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>FFFFFFFF</colordiffuse>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/white.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
+                            <animation type="focus" loop="false" reversible="false">
+                                <effect type="fade" time="500"/>
+                                <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                            </animation>
                         </control>
                         <control type="image">
-                            <posx>4</posx>
-                            <posy>4</posy>
-                            <width>48</width>
-                            <height>48</height>
-                            <aspectratio scalediffuse="false">scale</aspectratio>
-                            <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
+                            <posx>72</posx>
+                            <posy>0</posy>
+                            <width>502</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <bordersize>0</bordersize>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>6-col</width>
-                            <font>itemTitle</font>
+                            <width>7-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
+                            <selectedcolor>black</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.Property(Number),(,) - ]$INFO[ListItem.Property(Name)]</label>
                         </control>
                     </focusedlayout>
                 </control>
+
                 <!--channel management options-->
                 <control type="group">
                     <posx>8-col</posx>
@@ -142,7 +139,7 @@
                         <description>Channel activated</description>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>8-col-gutter</width>
+                        <width>8-col</width>
                         <label>19074</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -151,11 +148,14 @@
                     <control type="edit" id="8">
                         <description>Channel name</description>
                         <posx>0</posx>
-                        <posy>1-row</posy>
-                        <width>8-col-gutter</width>
-                        <height>54</height>
-                        <font>itemTitle</font>
+                        <posy>2-row</posy>
+                        <width>8-col</width>
+                        <font>buttonTitle</font>
                         <align>left</align>
+                        <texturefocus>colors/white.png</texturefocus>
+                        <texturenofocus>-</texturenofocus>
+                        <textoffsetx>24</textoffsetx>
+                        <focusedcolor>black</focusedcolor>
                         <label>19201</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -165,16 +165,8 @@
                     <control type="button" id="9">
                         <description>Channel logo Button</description>
                         <posx>0</posx>
-                        <posy>2-row</posy>
-                        <width>8-col-gutter</width>
-                        <height>54</height>
-                        <align>left</align>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <focusedcolor>black</focusedcolor>
-                        <texturefocus>colors/white.png</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
+                        <posy>4-row</posy>
+                        <width>8-col</width>
                         <label>19202</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -183,17 +175,17 @@
                     </control>
                     <control type="image" id="10">
                         <posx>496</posx>
-                        <posy>118</posy>
+                        <posy>156</posy>
                         <width>48</width>
                         <height>48</height>
                         <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
                     </control>
                     <control type="radiobutton" id="12">
                         <description>EPG activated</description>
                         <posx>0</posx>
-                        <posy>3-row</posy>
-                        <width>8-col-gutter</width>
+                        <posy>6-row</posy>
+                        <width>8-col</width>
                         <label>19206</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -203,8 +195,8 @@
                     <control type="spincontrolex" id="13">
                         <description>EPG source</description>
                         <posx>0</posx>
-                        <posy>4-row</posy>
-                        <width>8-col-gutter</width>
+                        <posy>8-row</posy>
+                        <width>8-col</width>
                         <label>19200</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -214,8 +206,8 @@
                     <control type="radiobutton" id="14">
                         <description>Parental locked</description>
                         <posx>0</posx>
-                        <posy>5-row</posy>
-                        <width>8-col-gutter</width>
+                        <posy>10-row</posy>
+                        <width>8-col</width>
                         <label>19267</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -225,16 +217,8 @@
                     <control type="button" id="30">
                         <description>Group Manager Button</description>
                         <posx>0</posx>
-                        <posy>6-row</posy>
-                        <width>8-col-gutter</width>
-                        <height>54</height>
-                        <align>left</align>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <focusedcolor>black</focusedcolor>
-                        <texturefocus>colors/white.png</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
+                        <posy>12-row</posy>
+                        <width>8-col</width>
                         <label>19205</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -245,16 +229,8 @@
                         <visible>IsEmpty(Window.Property(IsRadio))</visible>
                         <description>TV/Radio Button</description>
                         <posx>0</posx>
-                        <posy>7-row</posy>
-                        <width>8-col-gutter</width>
-                        <height>54</height>
-                        <align>left</align>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <focusedcolor>black</focusedcolor>
-                        <texturefocus>colors/white.png</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
+                        <posy>14-row</posy>
+                        <width>8-col</width>
                         <label>19024</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -265,16 +241,8 @@
                         <visible>!IsEmpty(Window.Property(IsRadio))</visible>
                         <description>TV/Radio Button</description>
                         <posx>0</posx>
-                        <posy>7-row</posy>
-                        <width>8-col-gutter</width>
-                        <height>54</height>
-                        <align>left</align>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <focusedcolor>black</focusedcolor>
-                        <texturefocus>colors/white.png</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
+                        <posy>14-row</posy>
+                        <width>8-col</width>
                         <label>19023</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -284,16 +252,8 @@
                     <control type="button" id="31">
                         <description>Edit channel Button</description>
                         <posx>0</posx>
-                        <posy>8-row</posy>
-                        <width>8-col-gutter</width>
-                        <height>54</height>
-                        <align>left</align>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <focusedcolor>black</focusedcolor>
-                        <texturefocus>colors/white.png</texturefocus>
-                        <texturenofocus>-</texturenofocus>
-                        <textoffsetx>12</textoffsetx>
+                        <posy>16-row</posy>
+                        <width>8-col</width>
                         <label>19203</label>
                         <onleft>20</onleft>
                         <onright>9000</onright>
@@ -301,66 +261,77 @@
                         <ondown>32</ondown>
                     </control>
                 </control>
+
                 <!--OK / Cancel / apply-->
                 <control type="panel" id="9000">
-                    <posx>17-col</posx>
+                    <posx>16-col</posx>
                     <posy>2-row</posy>
-                    <width>6-col</width>
-                    <height>5-row</height>
+                    <width>8-col</width>
+                    <height>6-row</height>
                     <itemgap>3</itemgap>
                     <orientation>vertical</orientation>
                     <onleft>7</onleft>
-                    <itemlayout width="6-col" height="1-row">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <height>53</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture>colors/black.png</texture>
-                        </control>
+                    <itemlayout width="8-col" height="2-row">
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
                             <font>symbol</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
-                            <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <font>menuTitle</font>
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label]</label>
-                            <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="6-col" height="1-row">
+                    <focusedlayout width="8-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <height>53</height>
+                            <posy>0</posy>
+                            <width>1-col-textbox</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+                            <include>spinFocusIcon</include>
+                        </control>
+                        <control type="image">
+                            <posx>1-col</posx>
+                            <posy>0</posy>
+                            <width>5-col-textbox</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
                             <font>symbol</font>
-                            <textcolor>black</textcolor>
+                            <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.label2]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                         <control type="label">
-                            <posx>1-col</posx>
-                            <posy>2</posy>
-                            <width>6-col</width>
-                            <font>menuTitle</font>
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <label>$INFO[ListItem.label]</label>
                             <shadowcolor>-</shadowcolor>
@@ -392,6 +363,7 @@
                 </control>
             </control>
         </control>
+
         <!--dialog control buttons-->
         <control type="group">
             <visible>false</visible>
@@ -406,6 +378,7 @@
                 <description>Cancel Button</description>
             </control>
         </control>
+
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml
index c87d369..9c02d44 100644
--- a/1080i/DialogPVRGroupManager.xml
+++ b/1080i/DialogPVRGroupManager.xml
@@ -4,135 +4,229 @@
     <controls>
         <!--background-->
         <include>globalBackground</include>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>99ffffff</colordiffuse>
-        </control>
         <control type="group">
-            <posx>col-1-begin</posx>
+            <posx>col-3-begin</posx>
             <posy>row-2-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <!--content provider title / info-->
             <control type="image">
-                <posx>-96</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>20-col</width>
+                <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>20-col</width>
+                <height>21-row</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>4-col</posx>
+                <posy>2-row</posy>
+                <width>6-col-textbox</width>
+                <height>21-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>10-col</posx>
+                <posy>2-row</posy>
+                <width>6-col-textbox</width>
+                <height>21-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>16-col</posx>
+                <posy>2-row</posy>
+                <width>4-col</width>
+                <height>21-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="label">
-                <posx>12</posx>
-                <posy>44</posy>
+                <posx>24</posx>
+                <posy>0</posy>
                 <width>16-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
                 <font>dialogTitle</font>
                 <label>$LOCALIZE[19143]</label>
-                <textcolor>black</textcolor>
+                <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
             <!--group menu-->
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>4-col-textbox</width>
+                <height>2-row</height>
+                <texture>colors/white.png</texture>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>44FFFFFF</colordiffuse>
+            </control>
+            <control type="label">
+                <description>name label</description>
+                <posx>24</posx>
+                <posy>2-row</posy>
+                <width>6-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
+                <font>itemTitle</font>
+                <textcolor>black</textcolor>
+                <label>$LOCALIZE[31194]</label>
+            </control>
             <control type="group">
-                <posx>12</posx>
-                <posy>1-row</posy>
+                <posx>0</posx>
+                <posy>3-row</posy>
                 <control type="list" id="13">
                     <posx>0</posx>
                     <posy>1-row</posy>
-                    <width>4-col</width>
-                    <height>11-row</height>
+                    <width>4-col-textbox</width>
+                    <height>21-row</height>
                     <onright>12</onright>
-                    <itemlayout width="4-col" height="43">
+                    <itemlayout height="2-row" width="4-col">
                         <control type="label">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>3-col-gutter</width>
-                            <font>menuTitle</font>
-                            <info>ListItem.Label</info>
-                            <textcolor>unselected</textcolor>
+                            <posx>24</posx>
+                            <posy>2</posy>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label]</label>
+                            <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="4-col" height="43">
-                        <control type="label">
+                    <focusedlayout height="2-row" width="4-col">
+                        <control type="image">
+                            <visible>!control.hasfocus(13)</visible>
+                            <posx>0</posx>
+                            <posy></posy>
+                            <width>4-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>77FFFFFF</colordiffuse>
+                        </control>
+                        <control type="image">
+                            <visible>control.hasfocus(13)</visible>
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>3-col-gutter</width>
-                            <font>menuTitle</font>
-                            <label>$INFO[ListItem.Label]</label>
-                            <textcolor>textActive</textcolor>
+                            <width>4-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                        </control>
+                        <control type="label">
+                            <posx>24</posx>
+                            <posy>0</posy>
+                            <width>4-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
+                            <textcolor>black</textcolor>
+                            <label>$INFO[ListItem.label]</label>
+                            <shadowcolor>-</shadowcolor>
                         </control>
                     </focusedlayout>
                 </control>
             </control>
+
             <!--grouped channels list-->
             <control type="group">
                 <description>Grouped Channels list</description>
                 <posx>4-col</posx>
                 <posy>2-row</posy>
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>6-col-textbox</width>
+                    <height>2-row</height>
+                    <texture>colors/white.png</texture>
+                    <aspectratio>stretch</aspectratio>
+                    <colordiffuse>44FFFFFF</colordiffuse>
+                </control>
                 <control type="label" id="22">
                     <description>name label</description>
-                    <posx>24</posx>
+                    <posx>0</posx>
                     <posy>0</posy>
-                    <width>6-col</width>
-                    <font>itemSubTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <width>6-col-gutter</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <font>itemTitle</font>
+                    <textcolor>black</textcolor>
                 </control>
                 <control type="panel" id="12">
                     <posx>0</posx>
-                    <posy>1-row</posy>
-                    <width>6-col</width>
-                    <height>11-row</height>
+                    <posy>2-row</posy>
+                    <width>6-col-textbox</width>
+                    <height>19-row</height>
                     <onleft>13</onleft>
                     <onright>11</onright>
-                    <itemlayout height="1-row" width="6-col">
+                    <itemlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col-gutter</width>
-                            <height>53</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>99FFFFFF</colordiffuse>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Icon]</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>5-col</width>
-                            <font>itemTitle</font>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.ChannelNumber,(,) - ]$INFO[ListItem.ChannelName]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout height="1-row" width="6-col">
+                    <focusedlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col-gutter</width>
-                            <height>53</height>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/white.png" border="0">$INFO[ListItem.Icon]</texture>
+                            <animation type="focus" loop="false" reversible="false">
+                                <effect type="fade" time="500"/>
+                                <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                            </animation>
+                        </control>
+                        <control type="image">
+                            <posx>72</posx>
+                            <posy>0</posy>
+                            <width>502</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
+                            <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
-                            <colordiffuse>FFFFFFFF</colordiffuse>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>5-col</width>
-                            <font>itemTitle</font>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
                             <shadowcolor>-</shadowcolor>
@@ -146,59 +240,84 @@
                 <description>Channels list</description>
                 <posx>10-col</posx>
                 <posy>2-row</posy>
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>6-col-textbox</width>
+                    <height>2-row</height>
+                    <texture>colors/white.png</texture>
+                    <aspectratio>stretch</aspectratio>
+                    <colordiffuse>44FFFFFF</colordiffuse>
+                </control>
                 <control type="label" id="21">
                     <description>name label</description>
-                    <posx>24</posx>
+                    <posx>0</posx>
                     <posy>0</posy>
                     <width>6-col</width>
-                    <font>itemSubTitle</font>
-                    <textcolor>highlight</textcolor>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <align>center</align>
+                    <font>itemTitle</font>
+                    <textcolor>black</textcolor>
                 </control>
                 <control type="panel" id="11">
                     <posx>0</posx>
-                    <posy>1-row</posy>
-                    <width>6-col</width>
-                    <height>11-row</height>
+                    <posy>2-row</posy>
+                    <width>6-col-textbox</width>
+                    <height>19-row</height>
                     <onleft>12</onleft>
                     <onright>9001</onright>
-                    <itemlayout height="1-row" width="6-col">
+                    <itemlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col-gutter</width>
-                            <height>53</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                            <bordersize>0</bordersize>
-                            <colordiffuse>99FFFFFF</colordiffuse>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Icon]</texture>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>5-col</width>
-                            <font>itemTitle</font>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.ChannelNumber,(,) - ]$INFO[ListItem.ChannelName]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout height="1-row" width="6-col">
+                    <focusedlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>2</posy>
-                            <width>6-col-gutter</width>
-                            <height>53</height>
+                            <posy>0</posy>
+                            <width>2-row</width>
+                            <height>2-row</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/white.png" border="0">$INFO[ListItem.Icon]</texture>
+                            <animation type="focus" loop="false" reversible="false">
+                                <effect type="fade" time="500"/>
+                                <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
+                            </animation>
+                        </control>
+                        <control type="image">
+                            <posx>72</posx>
+                            <posy>0</posy>
+                            <width>502</width>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
+                            <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
-                            <colordiffuse>FFFFFFFF</colordiffuse>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
                         <control type="label">
-                            <posx>24</posx>
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>5-col</width>
-                            <font>itemTitle</font>
+                            <width>5-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>buttonTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
                             <shadowcolor>-</shadowcolor>
@@ -208,65 +327,84 @@
                 </control>
             </control>
             <!--Dialog controls-->
-            <control type="panel" id="9001">
-                <posx>20-col</posx>
+            <control type="image">
+                <posx>16-col</posx>
                 <posy>2-row</posy>
-                <width>6-col</width>
-                <height>5-row</height>
+                <width>4-col</width>
+                <height>2-row</height>
+                <texture>colors/white.png</texture>
+                <aspectratio>stretch</aspectratio>
+                <colordiffuse>44FFFFFF</colordiffuse>
+            </control>
+            <control type="panel" id="9001">
+                <posx>16-col</posx>
+                <posy>4-row</posy>
+                <width>4-col</width>
+                <height>8-row</height>
                 <itemgap>3</itemgap>
                 <orientation>vertical</orientation>
                 <onleft>12</onleft>
-                <itemlayout width="6-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
+                <itemlayout width="8-col" height="2-row">
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <font>menuTitle</font>
+                        <posx>1-col-indent</posx>
+                        <posy>-1</posy>
+                        <width>4-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="6-col" height="1-row">
+                <focusedlayout width="8-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <include>spinFocusIcon</include>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>5-col-textbox</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <font>menuTitle</font>
+                        <posx>1-col-indent</posx>
+                        <posy>-1</posy>
+                        <width>5-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index b8575bf..1588b2c 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -135,6 +135,7 @@
                         <onclick>RunScript(script.games.rom.collection.browser,)</onclick>
                     </item>
                     <item id="9">
+                        <visible>!isempty(Window(Weather).Property(WeatherProvider))</visible>
                         <label>31197</label>
                         <label2></label2>
                         <thumb>-</thumb>
@@ -145,10 +146,8 @@
                         <label>137</label>
                         <label2></label2>
                         <thumb>-</thumb>
-
                         <onclick condition="!System.HasAddon(script.globalsearch)">RunPlugin(plugin://script.globalsearch)</onclick>
-
-                        <!--<onclick>RunScript(script.globalsearch)</onclick>-->
+                        <onclick condition="System.HasAddon(script.globalsearch)">RunScript(script.globalsearch)</onclick>
                         <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                         <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
                     </item>
@@ -198,6 +197,7 @@
                 <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
             </control>
             <control type="label">
+                <visible>!isempty(Window(Weather).Property(WeatherProvider))</visible>
                 <posx>8-col</posx>
                 <posy>182</posy>
                 <width>24-col</width>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 7092f9a..a33d387 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -2,7 +2,7 @@
 <window>
     <views>10</views>
     <defaultcontrol always="false">9999</defaultcontrol>
-    
+
     <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
@@ -36,7 +36,7 @@
                     <timeblocks>30</timeblocks>
                     <progresstexture border="0,33,18,14">UIControls/PVR-EpgProgressIndicator.png</progresstexture>
                     <rulerunit>6</rulerunit>
-                    <onback>8000</onback>
+                    <onback>9000</onback>
                     <rulerlayout height="2-row" width="216">
                         <control type="label" id="2">
                             <visible>SubString(ListItem.Label,:)</visible>
diff --git a/changelog.txt b/changelog.txt
index a18d944..4416a22 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -28,11 +28,16 @@
 
 ***To do***
 
+on startup: add check for parent folder items: system.getbool(showparentdiritems)
+
+PVR channel manager
+PVR Group manager
+
 Pictures section update
 
 DialogPVRinfo - button update
 
-Use 'has parent' to manage back button (open side menu on no parent item)
+Add filename to subtitles listings
 
 Radio RDS test
 
@@ -40,6 +45,8 @@ Touchscreen controls - get Android tablet for testing
 
 Addons manager - clean up a bit.
 
+Expand menu system to add options for sub menu etc (see xbox NXE for inspiration)
+
 
 [B]0.1.0[/B]
 - Initial Commit
diff --git a/language/English/strings.po b/language/English/strings.po
index ed82765..d2f33d9 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -517,6 +517,10 @@ msgctxt "#31193"
 msgid "Duration"
 msgstr ""
 
+msgctxt "#31194"
+msgid "Group"
+msgstr ""
+
 msgctxt "#31195"
 msgid "Hide watched items:"
 msgstr ""