From 957598286101634b01e59e1d1233dad657a00dd2 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Mon, 18 May 2015 20:37:03 +0100
Subject: [PATCH] various

---
 1080i/AddonBrowser.xml     | 253 ++++++++++++++++++-------------------
 1080i/DialogButtonMenu.xml |   4 +-
 1080i/DialogSelect.xml     |  20 +--
 1080i/Home.xml             |   1 -
 1080i/LoginScreen.xml      | 124 ++++++++++--------
 1080i/ProfileSettings.xml  | 191 ++++++++++------------------
 1080i/SettingsProfile.xml  | 185 +++++++++++----------------
 7 files changed, 345 insertions(+), 433 deletions(-)

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index b89950c..1905704 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -7,14 +7,14 @@
         <!--background-->
         <include>globalBackground</include>
         <control type="group" id="9001">
-            <posx>col-2-begin</posx>
+            <posx>col-1-begin</posx>
             <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>22-col</width>
+                <width>24-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -31,16 +31,25 @@
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
-            <!--options-->
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>22-col</width>
-                <height>21-row</height>
+                <width>24-col</width>
+                <height>22-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>6-col</width>
+                <height>22-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <!--options-->
             <control type="grouplist" id="9000">
                 <posx>0</posx>
                 <posy>2-row</posy>
@@ -71,149 +80,137 @@
                     <onright>9999</onright>
                 </control>
             </control>
-            <!--content listing-->
-            <control type="group" id="9999">
+            <!--Info panel-->
+            <control type="group">
                 <posx>6-col</posx>
                 <posy>2-row</posy>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>16-col</width>
-                    <height>21-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
+                    <width>18-col</width>
+                    <height>10-row</height>
+                    <aspectratio aligny="center">scale</aspectratio>
+                    <texture>$INFO[ListItem.art(fanart)]</texture>
+                    <colordiffuse>22ffffff</colordiffuse>
                 </control>
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>18-col</width>
+                    <height>10-row</height>
+                    <aspectratio aligny="center">scale</aspectratio>
+                    <texture>vignette.png</texture>
+                </control>
+                <control type="image">
+                    <posx>1-col</posx>
+                    <posy>1-row</posy>
+                    <width>4-col</width>
+                    <height>4-col</height>
+                    <aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
+                    <texture border="0">$INFO[Listitem.icon]</texture>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                    <fadetime>200</fadetime>
+                </control>
+                <control type="label">
+                    <description>Addon Title</description>
+                    <visible>!isempty(ListItem.Property(Addon.Creator))</visible>
+                    <posx>6-col-indent</posx>
+                    <posy>1-row</posy>
+                    <width>12-col-gutter</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <font>mediumStrong</font>
+                    <label>$INFO[ListItem.label]</label>
+                </control>
+                <control type="label">
+                    <posx>6-col-indent</posx>
+                    <posy>104</posy>
+                    <width>12-col-gutter</width>
+                    <font>itemSubTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <label>[COLOR highlight]$INFO[ListItem.Property(Addon.Status),[,] ][/COLOR]$INFO[ListItem.Property(Addon.Creator)]</label>
+                </control>
+                <control type="textbox" id="400">
+                    <posx>6-col-indent</posx>
+                    <posy>4-row</posy>
+                    <font>textbox</font>
+                    <width>12-col-gutter</width>
+                    <height>160</height>
+                    <label>$INFO[ListItem.Property(Addon.Description)]</label>
+                    <autoscroll delay="5000" time="1000" repeat="10000"/>
+                </control>
+            </control>
+
+            <!--content listing-->
+            <control type="group" id="9999">
+                <posx>6-col</posx>
+                <posy>12-row</posy>
                 <control type="panel" id="50">
                     <posx>12</posx>
                     <posy>12</posy>
                     <width>18-col</width>
-                    <height>734</height>
+                    <height>11-row</height>
                     <onleft>9000</onleft>
                     <onright>60</onright>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <pagecontrol>60</pagecontrol>
-                    <itemlayout width="4-col" height="4-col">
+                    <itemlayout height="2-row" width="9-col">
                         <control type="image">
                             <posx>0</posx>
+                            <posy>3</posy>
+                            <width>66</width>
+                            <height>66</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        </control>
+                        <control type="label">
+                            <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>4-col-gutter</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="3">colors/black.png</texture>
-                            <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <colordiffuse>textboxInactive</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>2-row</posy>
-                            <width>240</width>
+                            <width>8-col-gutter</width>
                             <height>2-row</height>
-                            <align>center</align>
                             <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>disabled</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>3-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
+                            <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label2]</label>
-                        </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>4-col-gutter</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture fallback="" border="0">$INFO[Listitem.thumb]</texture>
-                            <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <colordiffuse>ffFFFFFF</colordiffuse>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="4-col" height="4-col">
-                        <control type="group">
-                            <include>spinFocusPoster</include>
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>0</posy>
-                                <width>4-col-gutter</width>
-                                <height>4-col-gutter</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                                <bordertexture colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-                                <bordersize>3</bordersize>
-                                <colordiffuse>ff444444</colordiffuse>
-                            </control>
-                            <control type="label">
-                                <posx>12</posx>
-                                <posy>2-row</posy>
-                                <width>240</width>
-                                <height>2-row</height>
-                                <align>center</align>
-                                <aligny>center</aligny>
-                                <font>buttonTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <label>[B]$INFO[ListItem.label][/B]</label>
-                            </control>
-                            <control type="label">
-                                <posx>12</posx>
-                                <posy>3-row</posy>
-                                <width>240</width>
-                                <height>2-row</height>
-                                <align>center</align>
-                                <aligny>center</aligny>
-                                <font>buttonTitle</font>
-                                <textcolor>highlight</textcolor>
-                                <label>$INFO[ListItem.label2]</label>
-                            </control>
-                            <control type="grouplist">
-                                <posx>42</posx>
-                                <posy>5-row</posy>
-                                <width>4-col-gutter</width>
-                                <orientation>horizontal</orientation>
-                                <control type="label">
-                                    <width>24</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>symbol</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label></label>
-                                </control>
-                                <control type="label">
-                                    <width>1-col</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>smallStrong</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$LOCALIZE[31185]</label>
-                                </control>
-                                <control type="label">
-                                    <width>24</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>symbol</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label></label>
-                                </control>
-                                <control type="label">
-                                    <width>1-col</width>
-                                    <height>2-row</height>
-                                    <aligny>center</aligny>
-                                    <font>smallStrong</font>
-                                    <textcolor>textActive</textcolor>
-                                    <label>$LOCALIZE[31184]</label>
-                                </control>
-                            </control>
+                    <focusedlayout height="2-row" width="9-col">
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>3</posy>
+                            <width>66</width>
+                            <height>66</height>
+                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</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>1-col</posx>
+                            <posy>0</posy>
+                            <width>564</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-indent</posx>
+                            <posy>0</posy>
+                            <width>8-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>itemTitle</font>
+                            <textcolor>black</textcolor>
+                            <selectedcolor>black</selectedcolor>
+                            <shadowcolor>-</shadowcolor>
+                            <label>$INFO[ListItem.Label]</label>
                         </control>
                     </focusedlayout>
                 </control>
@@ -223,9 +220,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="70" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <right>2-col</right>
-                    <posy>78</posy>
-                    <height>750</height>
+                    <right>1-col</right>
+                    <posy>12-row</posy>
+                    <height>12-row</height>
                     <onleft>9999</onleft>
                 </control>
             </control>
diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml
index 5139867..db74fbd 100644
--- a/1080i/DialogButtonMenu.xml
+++ b/1080i/DialogButtonMenu.xml
@@ -15,7 +15,7 @@
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>6-col</width>
-                <height>8-row</height>
+                <height>12-row</height>
                 <itemgap>0</itemgap>
                 <itemlayout width="6-col" height="2-row">
                     <control type="label">
@@ -87,8 +87,8 @@
                         <visible>System.HasLoginScreen | IntegerGreaterThan(System.ProfileCount,1)</visible>
                         <visible>System.Loggedon</visible>
                         <thumb>-</thumb>
+                        <onclick>dialog.close(all,true)</onclick>
                         <onclick>System.LogOff</onclick>
-                        <onclick>Dialog.Close(all,true)</onclick>
                     </item>
                     <item id="7">
                         <description>Exit to desktop</description>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index e327b2a..9452e8d 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -11,7 +11,7 @@
             <include>modalDialogInOutVertical</include>
             <control type="group">
                 <posx>col-4-begin</posx>
-                <posy>row-3-begin</posy>
+                <posy>row-2-begin</posy>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -25,7 +25,7 @@
                     <posx>0</posx>
                     <posy>2-row</posy>
                     <width>18-col</width>
-                    <height>21-row</height>
+                    <height>22-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
@@ -34,7 +34,7 @@
                     <posx>6-col</posx>
                     <posy>12-row</posy>
                     <width>12-col</width>
-                    <height>11-row</height>
+                    <height>12-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
@@ -50,20 +50,10 @@
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <control type="group" id="9000">
-
                     <!--Info panel-->
                     <control type="group">
                         <posx>0</posx>
                         <posy>2-row</posy>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>18-col</width>
-                            <height>10-row</height>
-                            <aspectratio aligny="center">scale</aspectratio>
-                            <texture>$INFO[container(6).ListItem.art(fanart)]</texture>
-                            <colordiffuse>22ffffff</colordiffuse>
-                        </control>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
@@ -115,7 +105,7 @@
                     <!--What is this one?? NOT skin selection-->
                     <control type="panel" id="3">
                         <posx>6-col</posx>
-                        <posy>12-row</posy>
+                        <posy>450</posy>
                         <width>12-col</width>
                         <height>11-row</height>
                         <onleft>9999</onleft>
@@ -207,7 +197,7 @@
                     <!--skin selection etc-->
                     <control type="panel" id="6">
                         <posx>6-col-indent</posx>
-                        <posy>12-row</posy>
+                        <posy>450</posy>
                         <width>12-col</width>
                         <height>11-row</height>
                         <onleft>9999</onleft>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 75d9e05..20b768f 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -9,7 +9,6 @@
     <controls>
         <include>globalBackground</include>
         <include>homeBackground</include>
-
         <!--browse controls-->
         <control type="group">
             <posx>0</posx>
diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml
index 42248b3..2e2b127 100644
--- a/1080i/LoginScreen.xml
+++ b/1080i/LoginScreen.xml
@@ -5,76 +5,96 @@
     <controls>
         <include>globalBackground</include>
         <control type="group">
-            <posx>col-5-begin</posx>
-            <posy>row-10-begin</posy>
+            <posx>col-10-begin</posx>
+            <posy>row-8-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
-            <control type="list" id="52">
+            <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>16-col</width>
-                <height>11-row</height>
-                <orientation>horizontal</orientation>
-                <itemlayout width="4-col" height="4-col">
+                <width>6-col</width>
+                <height>6-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/white.png</texture>
+                <bordersize>0</bordersize>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
+            <control type="image">
+                <posx>142</posx>
+                <posy>36</posy>
+                <width>4-row</width>
+                <height>4-row</height>
+                <texture>kodilogo.png</texture>
+                <colordiffuse>textActive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="list" id="52">
+                <posx>0</posx>
+                <posy>6-row</posy>
+                <width>6-col</width>
+                <height>8-row</height>
+                <itemlayout width="6-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
+                        <width>69</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="3">colors/black.png</texture>
-                        <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>textboxInactive</colordiffuse>
+                        <texture fallback="colors/black" border="0">$INFO[Listitem.thumb]</texture>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>5-col</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                        <bordersize>0</bordersize>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>2-row</posy>
-                        <width>240</width>
+                        <posx>1-col-indent</posx>
+                        <posy>0</posy>
+                        <width>5-col-gutter</width>
                         <height>2-row</height>
-                        <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <font>itemTitle</font>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
-                    <control type="image">
+                </itemlayout>
+                <focusedlayout width="6-col" height="2-row">
+                      <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
+                        <width>69</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture fallback="" border="0">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <texture fallback="colors/black" border="0">$INFO[Listitem.thumb]</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>
-                </itemlayout>
-                <focusedlayout width="4-col" height="4-col">
-                    <control type="group">
-                        <include>spinFocusPoster</include>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>4-col-gutter</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                            <bordertexture colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <colordiffuse>ff444444</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>2-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>regularStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                        </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>5-col</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-indent</posx>
+                        <posy>0</posy>
+                        <width>5-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>itemTitle</font>
+                        <textcolor>black</textcolor>
+                        <label>$INFO[ListItem.label]</label>
                     </control>
                 </focusedlayout>
             </control>
diff --git a/1080i/ProfileSettings.xml b/1080i/ProfileSettings.xml
index 23d29e8..1a0acb9 100644
--- a/1080i/ProfileSettings.xml
+++ b/1080i/ProfileSettings.xml
@@ -4,70 +4,98 @@
     <allowoverlay>yes</allowoverlay>
     <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-7-begin</posx>
-            <posy>row-2-begin</posy>
+            <posx>col-9-begin</posx>
+            <posy>row-1-begin</posy>
             <!--animations-->
-            <include>modalDialogInOutVertical</include>
-            <control type="image" id="101">
-                <description>profile image</description>
-                <posx>324</posx>
+            <animation type="windowopen">
+                <effect type="fade" start="0" end="100" delay="400" time="300"/>
+                <effect type="slide" start="0,-300" end="0,0" tween="cubic" easing="out" delay="400" time="400"/>
+            </animation>
+            <control type="image">
+                <posx>0</posx>
                 <posy>0</posy>
-                <width>3-col</width>
-                <height>3-col</height>
-                <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">colors/offblack.png</texture>
-                <aspectratio>keep</aspectratio>
+                <width>8-col</width>
+                <height>2-row</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
+            <!--title-->
             <control type="label" id="102">
                 <posx>0</posx>
-                <posy>4-row</posy>
-                <width>12-col</width>
+                <posy>0</posy>
+                <width>8-col</width>
+                <height>2-row</height>
                 <align>center</align>
                 <font>dialogTitle</font>
                 <label>31103</label>
-                <textcolor>white</textcolor>
-                <shadowcolor>-</shadowcolor>
+                <textcolor>textActive</textcolor>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>8-col</width>
+                <height>4-col</height>
+                <aspectratio aligny="center">scale</aspectratio>
+                <texture>vignette.png</texture>
+            </control>
+            <control type="image" id="101">
+                <description>profile image</description>
+                <posx>156</posx>
+                <posy>84</posy>
+                <width>4-col-gutter</width>
+                <height>4-col-gutter</height>
+                <texture fallback="colors/offblack.png" border="0">colors/offblack.png</texture>
+                <aspectratio>scale</aspectratio>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>10-row</posy>
+                <width>8-col</width>
+                <height>2-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>textboxInactive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
             <control type="label" id="103">
                 <description>Profile Directory</description>
                 <posx>0</posx>
-                <posy>5-row</posy>
-                <width>12-col</width>
+                <posy>10-row</posy>
+                <width>8-col</width>
+                <height>2-row</height>
                 <align>center</align>
+                <aligny>center</aligny>
                 <font>itemSubTitle</font>
                 <textcolor>highlight</textcolor>
             </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>12-row</posy>
+                <width>8-col</width>
+                <height>15-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="button" id="6000">
                 <description>Profile switch</description>
                 <visible>!StringCompare(System.ProfileName,control.getlabel(1000))</visible>
-                <posx>2-col</posx>
-                <posy>7-row</posy>
-                <align>left</align>
-                <height>54</height>
+                <posx>0</posx>
+                <posy>12-row</posy>
                 <width>8-col</width>
-                <font>itemTitle</font>
-                <textcolor>textActive</textcolor>
-                <focusedcolor>black</focusedcolor>
-                <texturefocus>colors/white.png</texturefocus>
-                <texturenofocus>-</texturenofocus>
-                <textoffsetx>12</textoffsetx>
+                <font>buttonTitle</font>
+                <textoffsetx>24</textoffsetx>
                 <label>31131</label>
                 <onclick>LoadProfile($INFO[control.getlabel(1000)])</onclick>
                 <ondown>5</ondown>
             </control>
             <control type="grouplist" id="5">
                 <description>Control Area</description>
-                <posx>2-col</posx>
-                <posy>8-row</posy>
+                <posx>0</posx>
+                <posy>14-row</posy>
                 <width>8-col</width>
-                <height>11-row</height>
+                <height>13-row</height>
                 <itemgap>3</itemgap>
                 <orientation>vertical</orientation>
                 <ondown>9001</ondown>
@@ -75,14 +103,6 @@
             </control>
             <control type="button" id="7">
                 <description>button</description>
-                <align>left</align>
-                <height>54</height>
-                <font>itemTitle</font>
-                <textcolor>textActive</textcolor>
-                <focusedcolor>black</focusedcolor>
-                <texturefocus>colors/white.png</texturefocus>
-                <texturenofocus>-</texturenofocus>
-                <textoffsetx>12</textoffsetx>
             </control>
             <control type="radiobutton" id="8">
                 <description>radio_button</description>
@@ -90,89 +110,6 @@
             <control type="spincontrolex" id="9">
                 <description>spin_controlex</description>
             </control>
-            <!--OK / Cancel-->
-            <control type="panel" id="9001">
-                <posx>2-col</posx>
-                <posy>15-row</posy>
-                <width>8-col</width>
-                <height>1-row</height>
-                <itemgap>3</itemgap>
-                <orientation>horizontal</orientation>
-                <onleft>2</onleft>
-                <onup>5</onup>
-                <itemlayout width="4-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <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>3-col-gutter</width>
-                        <font>menuTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="4-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                    </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>0</posy>
-                        <width>1-col</width>
-                        <font>symbol</font>
-                        <textcolor>black</textcolor>
-                        <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
-                        <width>3-col-gutter</width>
-                        <font>menuTitle</font>
-                        <textcolor>black</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                </focusedlayout>
-                <content>
-                    <item id="1">
-                        <description>OK Button</description>
-                        <label>186</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>SendClick(130,28)</onclick>
-                    </item>
-                    <item id="2">
-                        <description>Cancel Button</description>
-                        <label>222</label>
-                        <label2></label2>
-                        <thumb>-</thumb>
-                        <onclick>SendClick(130,29)</onclick>
-                    </item>
-                </content>
-            </control>
         </control>
         <!--control buttons-->
         <control type="group">
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index b3c715a..8d80f28 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -6,14 +6,18 @@
         <!--background-->
         <include>globalBackground</include>
         <control type="group">
-            <posx>col-4-begin</posx>
-            <posy>row-7-begin</posy>
+            <posx>col-9-begin</posx>
+            <posy>row-1-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <animation type="conditional" condition="window.isactive(profilesettings)">
+                <effect type="fade" start="100" end="0" time="300"/>
+                <effect type="slide" start="0" end="0,300" tween="cubic" easing="out" time="400"/>
+            </animation>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>18-col</width>
+                <width>8-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -22,145 +26,110 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>18-col</width>
-                <height>380</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>2-row</height>
+                <width>8-col</width>
+                <height>25-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="label">
-                <posx>24</posx>
+                <posx></posx>
                 <posy>0</posy>
-                <width>16-col</width>
+                <width>8-col</width>
                 <height>2-row</height>
+                <align>center</align>
                 <aligny>center</aligny>
                 <font>dialogTitle</font>
                 <label>31103</label>
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
-
-            <!--dialog controls-->
-            <control type="radiobutton" id="4">
-                <description>Enable Login Screen</description>
+            <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>4-col</width>
-                <label>20096</label>
-                <align>left</align>
-                <ondown>2</ondown>
+                <width>8-col</width>
+                <height>4-col</height>
+                <aspectratio aligny="center">scale</aspectratio>
+                <texture>vignette.png</texture>
+            </control>
+            <control type="image">
+                <description>profile image</description>
+                <posx>156</posx>
+                <posy>84</posy>
+                <width>4-col-gutter</width>
+                <height>4-col-gutter</height>
+                <texture fallback="colors/offblack.png" border="0">$INFO[System.ProfileThumb]</texture>
+                <aspectratio>scale</aspectratio>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>10-row</posy>
+                <width>8-col</width>
+                <height>2-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>textboxInactive</colordiffuse>
+                <aspectratio>stretch</aspectratio>
             </control>
-
              <control type="label">
-                <posx>4-col-indent</posx>
-                <posy>2-row</posy>
-                <width>12-col</width>
+                <posx>0</posx>
+                <posy>10-row</posy>
+                <width>8-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
-                <align>left</align>
-                <font>itemTitle</font>
+                <align>center</align>
+                <font>itemSubTitle</font>
                 <label>$LOCALIZE[31107]: [COLOR highlight]$INFO[System.ProfileName][/COLOR]</label>
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
-
+            <!--dialog controls-->
+            <control type="radiobutton" id="4">
+                <description>Enable Login Screen</description>
+                <posx>0</posx>
+                <posy>12-row</posy>
+                <width>8-col</width>
+                <label>20096</label>
+                <align>left</align>
+                <ondown>2</ondown>
+            </control>
             <control type="panel" id="2">
-                <posx>24</posx>
-                <posy>166</posy>
-                <width>17-col</width>
-                <height>8-row</height>
+                <posx>0</posx>
+                <posy>14-row</posy>
+                <width>8-col</width>
+                <height>14-row</height>
                 <onup>4</onup>
-                <itemlayout width="4-col" height="4-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="3">colors/black.png</texture>
-                        <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>textboxInactive</colordiffuse>
-                    </control>
+                <itemlayout width="8-col" height="2-row">
                     <control type="label">
-                        <posx>12</posx>
-                        <posy>2-row</posy>
-                        <width>240</width>
+                        <posx>24</posx>
+                        <posy>0</posy>
+                        <width>7-col</width>
                         <height>2-row</height>
-                        <align>center</align>
                         <aligny>center</aligny>
-                        <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
+                        <font>buttonTitle</font>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
                     </control>
+                </itemlayout>
+                <focusedlayout width="8-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
-                        <aspectratio>scale</aspectratio>
-                        <texture fallback="" border="0">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <width>8-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <bordersize>0</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
                     </control>
-                </itemlayout>
-                <focusedlayout width="4-col" height="4-col">
-                    <control type="group">
-                        <include>spinFocusPoster</include>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>4-col-gutter</height>
-                            <aspectratio>scale</aspectratio>
-                            <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                            <bordertexture colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-                            <bordersize>3</bordersize>
-                            <colordiffuse>ff666666</colordiffuse>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>2-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>regularStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.label]</label>
-                        </control>
-                        <control type="grouplist">
-                            <posx>1-col</posx>
-                            <posy>5-row</posy>
-                            <width>4-col-gutter</width>
-                            <orientation>horizontal</orientation>
-                            <control type="label">
-                                <width>24</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>symbol</font>
-                                <textcolor>textActive</textcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <width>4-col</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>smallStrong</font>
-                                <textcolor>textActive</textcolor>
-                                <label>$LOCALIZE[31199]</label>
-                            </control>
-                        </control>
+                    <control type="label">
+                        <posx>24</posx>
+                        <posy>0</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
+                        <textcolor>black</textcolor>
+                        <label>$INFO[ListItem.label]</label>
                     </control>
                 </focusedlayout>
             </control>