From 25d26ab5cd25315a108661ce2f71d2d12694ec8c Mon Sep 17 00:00:00 2001
From: chrisbevan <chrisbevan@Chriss-iMac.local>
Date: Sun, 7 Aug 2016 18:54:04 +0100
Subject: [PATCH] More Krypton stuff

---
 1080i/AddonBrowser.xml          |  16 +--
 1080i/DialogAddonInfo.xml       |   8 +-
 1080i/DialogAddonSettings.xml   |   4 +-
 1080i/DialogAudioDSPManager.xml |   8 +-
 1080i/DialogMediaSource.xml     |   7 +-
 1080i/DialogSelect.xml          |   5 +-
 1080i/DialogSettings.xml        | 156 +++++++++++++++++---
 1080i/MyPVRTimers.xml           |   0
 1080i/MyPrograms.xml            | 247 ++++++++++++++------------------
 1080i/Settings.xml              |   6 +-
 1080i/VideoOSD.xml              |   2 +-
 changelog.txt                   |   6 +-
 language/English/strings.po     |  24 ++--
 13 files changed, 279 insertions(+), 210 deletions(-)
 create mode 100644 1080i/MyPVRTimers.xml

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 3332843..78a7bc7 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -64,16 +64,6 @@
                 <posy>13-row</posy>
                 <width>6-col</width>
                 <orientation>vertical</orientation>
-                <control type="radiobutton" id="6">
-                    <width>6-col</width>
-                    <texturenofocus>-</texturenofocus>
-                    <radiowidth/>
-                    <radioheight/>
-                    <textureradiofocus>-</textureradiofocus>
-                    <textureradionofocus>-</textureradionofocus>
-                    <label>25000</label>
-                    <onright>9999</onright>
-                </control>
                 <control type="radiobutton" id="7">
                     <width>6-col</width>
                     <texturenofocus>-</texturenofocus>
@@ -97,7 +87,7 @@
                 <control type="button" id="5">
                     <width>6-col</width>
                     <texturenofocus>-</texturenofocus>
-                    <label>24063</label>
+                    <label>10004</label>
                     <onright>9999</onright>
                 </control>
                 <control type="button" id="9">
@@ -141,7 +131,7 @@
                 </control>
                 <control type="label">
                     <description>Addon Title</description>
-                    <visible>!isempty(ListItem.Property(Addon.Creator))</visible>
+                    <visible>!isempty(ListItem.AddonCreator)</visible>
                     <posx>9-col</posx>
                     <posy>58</posy>
                     <width>10-col-gutter</width>
@@ -156,7 +146,7 @@
                     <font>textbox</font>
                     <width>10-col-gutter</width>
                     <height>160</height>
-                    <label>$INFO[ListItem.Property(Addon.Description)]</label>
+                    <label>$INFO[ListItem.AddonDescription]</label>
                     <autoscroll delay="5000" time="1000" repeat="10000"/>
                 </control>
             </control>
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 154ab53..a4a93e9 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -25,7 +25,7 @@
                 <width>17-col</width>
                 <height>2-row</height>
                 <font>dialogTitle</font>
-                <label>$INFO[ListItem.Property(Addon.Type)]</label>
+                <label>$INFO[ListItem.AddonType]</label>
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
@@ -86,7 +86,7 @@
                     <height>2-row</height>
                     <aligny>center</aligny>
                     <font>mediumStrong</font>
-                    <label>$INFO[ListItem.Property(Addon.Name)]</label>
+                    <label>$INFO[ListItem.addonname]</label>
                 </control>
                 <control type="label">
                     <posx>12</posx>
@@ -94,7 +94,7 @@
                     <width>12-col-gutter</width>
                     <font>small</font>
                     <textcolor>highlight</textcolor>
-                    <label>[B]$LOCALIZE[31082] $INFO[ListItem.Property(Addon.Version)], $INFO[ListItem.Property(Addon.Creator)][/B]</label>
+                    <label>[B]$LOCALIZE[31082] $INFO[ListItem.AddonVersion], $INFO[ListItem.AddonCreator][/B]</label>
                 </control>
                 <control type="textbox" id="400">
                     <posx>12</posx>
@@ -102,7 +102,7 @@
                     <font>textbox</font>
                     <width>12-col-gutter</width>
                     <height>9-row</height>
-                    <label>$INFO[ListItem.Property(Addon.Description)]</label>
+                    <label>$INFO[ListItem.AddonDescription]</label>
                     <autoscroll delay="5000" time="1000" repeat="10000"/>
                 </control>
             </control>
diff --git a/1080i/DialogAddonSettings.xml b/1080i/DialogAddonSettings.xml
index 83f1330..17dc26f 100644
--- a/1080i/DialogAddonSettings.xml
+++ b/1080i/DialogAddonSettings.xml
@@ -42,7 +42,7 @@
                 <width>4-col-gutter</width>
                 <height>4-col-gutter</height>
                 <aspectratio>stretch</aspectratio>
-                <texture fallback="colors/offblack.png">$INFO[System.AddonIcon(ListItem.Property(Addon.id))]</texture>
+                <texture fallback="colors/offblack.png">$INFO[System.AddonIcon(ListItem.Addonid)]</texture>
                 <bordertexture border="3" colordiffuse="07FFFFFF">colors/white.png</bordertexture>
                 <bordersize>3</bordersize>
             </control>
@@ -62,7 +62,7 @@
                 <height>2-row</height>
                 <aligny>center</aligny>
                 <font>dialogTitle</font>
-                <label>$INFO[ListItem.Property(Addon.Name)] $LOCALIZE[5]</label>
+                <label>$INFO[ListItem.AddonName] $LOCALIZE[5]</label>
                 <textcolor>textActive</textcolor>
             </control>
 
diff --git a/1080i/DialogAudioDSPManager.xml b/1080i/DialogAudioDSPManager.xml
index 23d0c11..5673e29 100644
--- a/1080i/DialogAudioDSPManager.xml
+++ b/1080i/DialogAudioDSPManager.xml
@@ -213,7 +213,7 @@
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
                             <selectedcolor>textActive</selectedcolor>
-                            <label>$INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
+                            <label>$INFO[ListItem.AddonName]: $INFO[ListItem.Property(Name)]</label>
                         </control>
                     </itemlayout>
                     <focusedlayout height="66" width="528">
@@ -249,7 +249,7 @@
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
                             <selectedcolor>textActive</selectedcolor>
-                            <label>$INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
+                            <label>$INFO[ListItem.AddonName]: $INFO[ListItem.Property(Name)]</label>
                         </control>
 
                         <control type="label">
@@ -374,7 +374,7 @@
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
                             <selectedcolor>textActive</selectedcolor>
-                            <label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
+                            <label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.AddonName]: $INFO[ListItem.Property(Name)]</label>
                         </control>
                     </itemlayout>
                     <focusedlayout height="66" width="528">
@@ -416,7 +416,7 @@
                             <textcolor>white</textcolor>
                             <scroll>false</scroll>
                             <selectedcolor>textActive</selectedcolor>
-                            <label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.Property(AddonName)]: $INFO[ListItem.Property(Name)]</label>
+                            <label>$INFO[ListItem.Property(Number)].  $INFO[ListItem.AddonName]: $INFO[ListItem.Property(Name)]</label>
                             <visible>true</visible>
                         </control>
                         <control type="label">
diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml
index d4a3cbb..9c19735 100644
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol>10</defaultcontrol>
-    <coordinates>
-        <system>1</system>
-        <posx>0</posx>
-        <posy>0</posy>
-    </coordinates>
+    <defaultcontrol>8000</defaultcontrol>
     <controls>
         <!--background-->
         <include>globalBackground</include>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 65cbb01..36b344a 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -89,7 +89,7 @@
                             <width>12-col-gutter</width>
                             <font>itemSubTitle</font>
                             <textcolor>highlight</textcolor>
-                            <label>$INFO[container(6).ListItem.Property(Addon.Creator)]</label>
+                            <label>$INFO[container(6).ListItem.AddonCreator]</label>
                         </control>
                         <control type="textbox" id="400">
                             <posx>6-col-indent</posx>
@@ -97,7 +97,7 @@
                             <font>textbox</font>
                             <width>12-col-gutter</width>
                             <height>160</height>
-                            <label>$INFO[container(6).ListItem.Property(Addon.Description)]</label>
+                            <label>$INFO[container(6).ListItem.AddonDescription]</label>
                             <autoscroll delay="5000" time="1000" repeat="10000"/>
                         </control>
                     </control>
@@ -347,6 +347,7 @@
                         </item>
                         <item id="2">
                             <description>Cancel Button</description>
+							<label>222</label>
                             <label2></label2>
                             <thumb>-</thumb>
           					<onclick>SendClick(2000,7)</onclick>
diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml
index 393d9fc..70489a0 100644
--- a/1080i/DialogSettings.xml
+++ b/1080i/DialogSettings.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
     <defaultcontrol>5</defaultcontrol>
-
+	<include>fadeInOut</include>
     <controls>
+		<include>modalDialog</include>
         <control type="group">
-
             <visible>!Window.IsVisible(sliderdialog)</visible>
-
+			<posx>col-5-begin</posx>
+            <posy>row-4-begin</posy>
+            <!--animations-->
+            <include>modalDialogInOutVertical</include>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>18-col</width>
+                <width>16-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -19,8 +22,17 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>18-col</width>
-                <height>18-row</height>
+                <width>16-col</width>
+                <height>19-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>12-col</width>
+                <height>19-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -28,7 +40,7 @@
             <control type="label" id="2">
                 <posx>24</posx>
                 <posy>0</posy>
-                <width>16-col</width>
+                <width>16-col-gutter</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
                 <font>dialogTitle</font>
@@ -38,11 +50,10 @@
 
             <control type="grouplist" id="5">
                 <description>control area</description>
-                <left>29</left>
-                <top>100</top>
-                <width>1160</width>
-                <height>750</height>
-                <onleft>9000</onleft>
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>12-col</width>
+                <height>19-row</height>
                 <onright>9000</onright>
                 <onup>5</onup>
                 <ondown>5</ondown>
@@ -65,18 +76,121 @@
             </control>
             <control type="label" id="14">
                 <description>Default Label</description>
+                <label>-</label>
+                <align>left</align>
+                <aligny>center</aligny>
+                <textoffsetx>24</textoffsetx>
+                <height>2-row</height>
+                <font>settingsCategoryTitle</font>
+                <textcolor>highlight</textcolor>
+                <shadowcolor>-</shadowcolor>
+            </control>
+
+			<!--dialog control buttons-->
+            <control type="panel" id="9000">
+                <posx>12-col</posx>
+                <posy>2-row</posy>
+                <width>4-col</width>
+                <height>6-row</height>
+                <orientation>vertical</orientation>
+                <onleft>5</onleft>
+                <itemlayout width="4-col" height="2-row">
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>symbolLarge</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label2]</label>
+                        <shadowcolor>-</shadowcolor>
+                    </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>buttonTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label]</label>
+                        <shadowcolor>-</shadowcolor>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="4-col" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col</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</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                    </control>
+                    <control type="label">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>symbolLarge</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label2]</label>
+                        <shadowcolor>-</shadowcolor>
+                    </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>buttonTitle</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(28)</onclick>
+                    </item>
+                    <item id="2">
+                        <description>Cancel Button</description>
+                        <label>222</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>SendClick(29)</onclick>
+                    </item>
+                    <item id="3">
+                        <visible>Control.IsEnabled(30)</visible>
+                        <description>clear / settings</description>
+                        <label>31048</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>SendClick(30)</onclick>
+                    </item>
+                </content>
             </control>
 
             <!--dialog controls-->
-            <control type="grouplist" id="9000">
-                <left>1210</left>
-                <top>92</top>
-                <orientation>vertical</orientation>
-                <width>300</width>
-                <height>250</height>
-                <itemgap>-10</itemgap>
-                <onleft>5</onleft>
-                <onright>5</onright>
+            <control type="group">
+                <visible>false</visible>
                 <control type="button" id="28">
                     <description>OK</description>
                 </control>
diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml
new file mode 100644
index 0000000..e69de29
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index cc4bf4d..3ef773c 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -18,146 +18,113 @@
                 <!--source content-->
                 <control type="group">
                     <control type="panel" id="50">
-                        <posx>col-1-begin</posx>
-                        <posy>row-5-begin</posy>
-                        <width>24-col</width>
-                        <height>24-row</height>
-                        <onleft>9000</onleft>
-                        <onright>60</onright>
-                        <ondown>50</ondown>
-                        <onup>50</onup>
-                        <pagecontrol>60</pagecontrol>
-                        <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="07FFFFFF">colors/white.png</bordertexture>
-                                <bordersize>3</bordersize>
-                                <colordiffuse>textboxInactive</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>textDisabled</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>
-                                <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>
-                            </control>
-                        </itemlayout>
-                        <focusedlayout width="4-col" height="4-col">
-                            <control type="group">
-                                <include>focusThumb</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>ffFFFFFF</colordiffuse>
-                                </control>
-                                <control type="image">
-                                    <posx>3</posx>
-                                    <posy>3</posy>
-                                    <width>258</width>
-                                    <height>258</height>
-                                    <aspectratio>stretch</aspectratio>
-                                    <texture border="0">colors/black.png</texture>
-                                    <colordiffuse>ccFFFFFF</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="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>
-                            </control>
-                        </focusedlayout>
+                        <posx>78</posx>
+			            <posy>row-5-begin</posy>
+			            <width>1800</width>
+			            <height>24-row</height>
+			            <onleft>9000</onleft>
+			            <onright>60</onright>
+			            <ondown>50</ondown>
+			            <onup>50</onup>
+			            <onback>9000</onback>
+			            <pagecontrol>60</pagecontrol>
+			            <scrolltime tween="cubic" easing="out">600</scrolltime>
+			            <itemlayout width="300" height="348">
+			                <control type="image">
+			                    <posx>0</posx>
+			                    <posy>0</posy>
+			                    <width>4-col-gutter</width>
+			                    <height>4-col-gutter</height>
+			                    <aspectratio>stretch</aspectratio>
+			                    <texture border="6">DefaultAlbumCover.png</texture>
+			                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+			                    <bordersize>6</bordersize>
+			                    <colordiffuse>overlay</colordiffuse>
+			                </control>
+			                <control type="label">
+			                    <visible>!controlgroup(9000).hasfocus</visible>
+			                    <posx>12</posx>
+			                    <posy>264</posy>
+			                    <width>240</width>
+			                    <height>1-row</height>
+			                    <align>center</align>
+			                    <aligny>center</aligny>
+			                    <font>thumbtitle</font>
+			                    <textcolor>textDisabled</textcolor>
+			                    <label>[B]$INFO[ListItem.label][/B]</label>
+			                </control>
+			                <control type="label">
+			                    <visible>!controlgroup(9000).hasfocus</visible>
+			                    <posx>12</posx>
+			                    <posy>292</posy>
+			                    <width>240</width>
+			                    <height>1-row</height>
+			                    <align>center</align>
+			                    <aligny>center</aligny>
+			                    <font>thumbTitle</font>
+			                    <textcolor>textDisabled</textcolor>
+			                    <label>$INFO[ListItem.AddonSummary]</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 border="6">$INFO[Listitem.thumb]</texture>
+			                    <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+			                    <bordersize>6</bordersize>
+			                    <colordiffuse>ffFFFFFF</colordiffuse>
+			                </control>
+			            </itemlayout>
+			            <focusedlayout width="4-col" height="348">
+			                <control type="group">
+			                    <include>focusThumb</include>
+			                    <control type="image">
+			                        <posx>0</posx>
+			                        <posy>0</posy>
+			                        <width>4-col-gutter</width>
+			                        <height>4-col-gutter</height>
+			                        <aspectratio>stretch</aspectratio>
+			                        <texture border="6">DefaultAlbumCover.png</texture>
+			                        <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+			                        <bordersize>6</bordersize>
+			                        <colordiffuse>ff666666</colordiffuse>
+			                    </control>
+			                    <control type="image">
+			                        <posx>0</posx>
+			                        <posy>0</posy>
+			                        <width>4-col-gutter</width>
+			                        <height>4-col-gutter</height>
+			                        <aspectratio>stretch</aspectratio>
+			                        <texture border="6">$INFO[Listitem.thumb]</texture>
+			                        <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
+			                        <bordersize>6</bordersize>
+			                    </control>
+			                    <control type="label">
+			                        <posx>12</posx>
+			                        <posy>264</posy>
+			                        <width>240</width>
+			                        <height>1-row</height>
+			                        <align>center</align>
+			                        <aligny>center</aligny>
+			                        <font>thumbtitle</font>
+			                        <textcolor>textActive</textcolor>
+			                        <label>[B]$INFO[ListItem.label][/B]</label>
+			                    </control>
+			                    <control type="label">
+			                        <posx>12</posx>
+			                        <posy>292</posy>
+			                        <width>240</width>
+			                        <height>1-row</height>
+			                        <align>center</align>
+			                        <aligny>center</aligny>
+			                        <font>thumbTitle</font>
+			                        <textcolor>textActive</textcolor>
+			                        <label>$INFO[ListItem.AddonSummary]</label>
+			                    </control>
+			                </control>
+			            </focusedlayout>
                     </control>
                 </control>
             </control>
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index f225dca..b9a831b 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -84,7 +84,7 @@
                         <width>5-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>itemSubTitle</font>
+                        <font>settingsCategoryTitle</font>
                         <textcolor>menuUnselected</textcolor>
                         <label>$INFO[listitem.property(label3)]</label>
                     </control>
@@ -127,7 +127,7 @@
                         <width>5-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
-                        <font>itemSubTitle</font>
+                        <font>settingsCategoryTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[listitem.property(label3)]</label>
                     </control>
@@ -201,7 +201,7 @@
                         <label>10003</label>
                         <label2></label2>
                         <property name="label3">$LOCALIZE[31095]</property>
-                        <onclick>activatewindow(1103)</onclick>
+                        <onclick>activatewindow(filemanager)</onclick>
                     </item>
                     <item>
                         <description>Programs</description>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 49d6f93..4126675 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -16,7 +16,7 @@
                 <posx>-36</posx>
                 <posy>-36</posy>
                 <width>7-col</width>
-                <height>14-row</height>
+                <height>16-row</height>
                 <texture>colors/black.png</texture>
                 <aspectratio>stretch</aspectratio>
                 <colordiffuse>textboxInactive</colordiffuse>
diff --git a/changelog.txt b/changelog.txt
index 3734d9c..e4b4ced 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,7 +15,10 @@
 [TODO]
 DialogAudioDSPManager.xml
 Check yes / no dialogs working correctly
-Check layouts for newly aggregated dialogs
+[DONE] Check layouts for newly aggregated dialogs (dialogSettings.xml)
+[Finalise] strings for settings dialog
+check all active strings
+MyPVRTimers needs creating and testing
 
 
 
@@ -40,7 +43,6 @@ Check layouts for newly aggregated dialogs
 - [REMOVED] ProfileSettings.xml
 - [REMOVED] VideoOSDSettings.xml
 - [REMOVED] DialogMuteBug.xml
-
 - [MODIFIED] Settings.xml: Updated to reflect changes to Kodi settings structure
 
 [B]1.0.0[/B]
diff --git a/language/English/strings.po b/language/English/strings.po
index 98ab53c..0a033a7 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -258,7 +258,7 @@ msgid "PVR"
 msgstr ""
 
 msgctxt "#31061"
-msgid "Interface • Interface"
+msgid "Adjust look and feel of Kodi"
 msgstr ""
 
 msgctxt "#31062"
@@ -266,7 +266,7 @@ msgid "Memory"
 msgstr ""
 
 msgctxt "#31063"
-msgid "Playback • Subtitles"
+msgid "Manage content playback"
 msgstr ""
 
 msgctxt "#31064"
@@ -282,7 +282,7 @@ msgid "Audio CDs"
 msgstr ""
 
 msgctxt "#31067"
-msgid "Addons • Addons"
+msgid "Extend Kodi's functionality"
 msgstr ""
 
 msgctxt "#31068"
@@ -298,7 +298,7 @@ msgid "Screen"
 msgstr ""
 
 msgctxt "#31071"
-msgid "Networking • Airplay"
+msgid "Communications and sharing"
 msgstr ""
 
 msgctxt "#31072"
@@ -330,7 +330,7 @@ msgid "Now and Next"
 msgstr ""
 
 msgctxt "#31079"
-msgid "Library • Library"
+msgid "Import your content into Kodi"
 msgstr ""
 
 msgctxt "#31080"
@@ -338,7 +338,7 @@ msgid "Programme Guide"
 msgstr ""
 
 msgctxt "#31081"
-msgid "Live TV • Live TV"
+msgid "Digital Television Setup"
 msgstr ""
 
 msgctxt "#31082"
@@ -346,7 +346,7 @@ msgid "Version"
 msgstr ""
 
 msgctxt "#31083"
-msgid "Skin settings • Skin Settings"
+msgid "Skin specific options"
 msgstr ""
 
 msgctxt "#31085"
@@ -370,7 +370,7 @@ msgid "Add Music Playlist"
 msgstr ""
 
 msgctxt "#31095"
-msgid "Transfer • Copy Files"
+msgid "Transfer and copy files"
 msgstr ""
 
 msgctxt "#31096"
@@ -402,11 +402,11 @@ msgid "Disable fanart animation effect"
 msgstr ""
 
 msgctxt "#31103"
-msgid "Profile Settings • Login options"
+msgid "Control how Kodi is used"
 msgstr ""
 
 msgctxt "#31105"
-msgid "System settings • System settings"
+msgid "Manage your Kodi system"
 msgstr ""
 
 msgctxt "#31106"
@@ -418,7 +418,7 @@ msgid "Current profile"
 msgstr ""
 
 msgctxt "#31108"
-msgid "CPU Temp • HDD Space"
+msgid "About this Kodi Installation"
 msgstr ""
 
 msgctxt "#31109"
@@ -430,7 +430,7 @@ msgid "Order: Descending"
 msgstr ""
 
 msgctxt "#31111"
-msgid "Programs • Programs"
+msgid "Manage your program addons"
 msgstr ""
 
 msgctxt "#31112"